search

ppp-project / ppp

Paul's PPP Package: PPP daemon and associated utilities | Official GitHub repo: https://github.com/ppp-project/ppp
https://github.com/ppp-project/ppp
Other
387 stars 231 forks source link

We should avoid code duplication between rp-pppoe and this project #383

Open dfskoll opened 1 year ago

dfskoll commented 1 year ago

The pppd/plugins/pppoe directory contains a substantial amount of code from the rp-pppoe project, and unfortunately that code has diverged from upstream.

I think we should synchronize the projects so the code isn't duplicated, and possibly remove the pppoe plugin from the ppp project once rp-pppoe builds and installs properly alongside ppp.

Created this issue in response to https://github.com/ppp-project/ppp/pull/379#issuecomment-1372472906

pali commented 1 year ago

I also do not see the need for a third repo. The PPPoE plugin can live under pppd/plugins and RP-PPPoE (the server and relay implementation) can stay where they are;

+1

enaess commented 1 year ago

I was under the impression that @dfskoll would want to be one of the owners of a new repository under ppp-project/pppoe-plugin (or whatever name seemed appropriate).

Generally, I was hoping to remove the additional plugin(s) from pppd for a simpler autoconf/automake configuration. Though this change does have impact on others

So with the current proposal, we are collectively thinking the rp-pppoe project should just nuke it's version of the pppoe plugin and patches be submitted to pppd/pppoe plugin to account for differences. I'd generally be okay with that, not sure if that is what @dfskoll originally signed up for.

@Neustradamus what do you think?

dfskoll commented 1 year ago

I didn't originally sign up for moving the plugin under ppp and nuking it from rp-pppoe, but I've come around to thinking that's the best path forward.

The PPPoE protocol is mature and so is the PPPoE plugin code. Any interesting new work is going to be done on the rp-pppoe server, so I'm fine with handing off the protocol-handling code to the ppp/pppd project.

dfskoll commented 1 year ago

I didn't originally sign up for moving the plugin under ppp and nuking it from rp-pppoe, but I've come around to thinking that's the best path forward.

And... I have changed my mind. It has been brought to my attention that user-mode PPPoE still has use-cases (specifically, on systems where everything is statically-linked... on such systems, plugins are impossible.)

I assume that the PPP project has no interest in maintaining user-mode PPPoE using the pppoe executable with the pty plugin, so that will stay under RP-PPPoE. Since that requires all the discovery code anyway, it's not possible to de-dupe the PPPoE code between RP-PPPoE and the PPP project.

As such, I'm abandoning the idea of merging the two projects. I will continue maintaining RP-PPPoE, and the PPP project can maintain its fork of the plugin code separately. Distro packagers can decide whether to ship the pppoe.so plugin from the PPP project, or the rp-pppoe.so plugin from the RP-PPPoE project. (If I maintain user-mode PPPoE, there's very little extra cost to supplying the plugin too.)

So I guess I consider this issue closed, but I won't actually close it in case there's further discussion.

Regards,

Dianne.

jkroonza commented 1 year ago

@paulusmack @enaess This can be closed.