nm-l2tp / NetworkManager-l2tp

L2TP and L2TP/IPsec support for NetworkManager
GNU General Public License v2.0
486 stars 83 forks source link

Adding support for compiling against pppd-2.5.0 (current master) #204

Closed enaess closed 1 year ago

enaess commented 1 year ago

Sorry, had a force update of the branch a minute later than you merged it into main.

This one include the actual nm-l2tp-ppp-status.h and fixes to Makefile.am. Compiles against both ppp 2.4.9 and current master (2.5.0).

dkosovic commented 1 year ago

No worries.

I just read the code and thought it looked okay, I didn't test. Will test and merge when I get home

enaess commented 1 year ago

Cool! I don't have a good l2tp setup, but I did validate the change against the sstp variant.

Also, pppd 2.5.0 has cool features like peap-mschapv2. Look to salsa / debian for configure argument to set it up. Project switched to using autotools now

dkosovic commented 1 year ago

Looking forward to the new pppd-2.5.0.

I built the current master pppd on Fedora 37.

I just tried building building your pull request, but get the following error message:

 CC       src/nm_l2tp_pppd_plugin_la-nm-l2tp-pppd-plugin.lo
In file included from src/nm-l2tp-pppd-plugin.c:20:
src/nm-l2tp-pppd-compat.h:50:11: fatal error: pppd/chap-new.h: No such file or directory
   50 |  #include <pppd/chap-new.h>
      |           ^~~~~~~~~~~~~~~~~
compilation terminated.

In the current master pppd, the pppd/chap.h header has:

/*
 * chap-new.c - New CHAP implementation.
enaess commented 1 year ago

Did you rerun autogen.sh?

dkosovic commented 1 year ago

I did, but looking at my history it was before I did sudo rpm -e ppp ppp-devel to remove the older version and had the new version installed on top of the old, I then re-installed the new version.

All good now, thanks. I'll merge it.

enaess commented 1 year ago

It would be good if you run some additional smoke test on pppd 2.5.0. if there is anything needs changing, now would be the time.

dkosovic commented 1 year ago

I've done some testing with xl2tpd and katalix go-l2tp and the (MSCHAPv2) L2TP connections work on Fedora 37. Will submit a bug if I encounter any build or runtime issue I don't get with earlier pppd version.

enaess commented 1 year ago

That would be awesome. Thanks for merging