From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH] networking: Allow changing DHCP Option Rapid Commit Date: Wed, 16 Oct 2024 10:47:17 +0000 Message-ID: <20241016104717.3778264-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0809003377821735761==" List-Id: --===============0809003377821735761== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This option needs to be configurable since some (braindead) ISPs have started running broken DHCP servers to be bug-compatible with cheap broken plastic routers. By default we keep this option enabled, but it can now be turned off whenever needed. Suggested-by: Adolf Belka Signed-off-by: Michael Tremer --- config/dhcpc/dhcpcd.conf | 5 ---- src/initscripts/networking/red | 13 +++++++++- src/setup/netstuff.c | 47 +++++++++++++++++++++++++++------- 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/config/dhcpc/dhcpcd.conf b/config/dhcpc/dhcpcd.conf index 062e3c975..b46c85cab 100644 --- a/config/dhcpc/dhcpcd.conf +++ b/config/dhcpc/dhcpcd.conf @@ -37,11 +37,6 @@ option host_name # Most distributions have NTP support. option ntp_servers =20 -# Rapid commit support. -# Safe to enable by default because it requires the equivalent option set -# on the server to actually work. -option rapid_commit - # A ServerID is required by RFC2131. require dhcp_server_identifier =20 diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index 34ee8cc58..72b9bf0cf 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -171,9 +171,20 @@ case "${1}" in # To determine this we check if a wpa_supplicant is running. pid=3D"$(pidof wpa_supplicant)" =20 + DHCPCD_ARGS=3D() + + # Enable Rapid Commit (enabled by default) + case "${RED_DHCP_RAPID_COMMIT}" in + ""|yes|true|on) + DHCPCD_ARGS+=3D( "--option" "rapid_commit" ) + ;; + esac + + echo dhcpcd_start "${DEVICE}" "${DHCPCD_ARGS[@]}" + if [ -z "${pid}" ]; then # No wpa_supplicant is running. So it's save to start dhcpcd. - dhcpcd_start "${DEVICE}" + dhcpcd_start "${DEVICE}" "${DHCPCD_ARGS[@]}" fi =20 elif [ "$TYPE" =3D=3D "PPPOE" ]; then diff --git a/src/setup/netstuff.c b/src/setup/netstuff.c index 60e27242f..602ef97f5 100644 --- a/src/setup/netstuff.c +++ b/src/setup/netstuff.c @@ -37,6 +37,7 @@ newtComponent dhcptyperadio; newtComponent pppoetyperadio; newtComponent dhcphostnameentry; newtComponent dhcpforcemtuentry; +newtComponent dhcprapidcommitentry; =20 /* acceptable character filter for IP and netmaks entry boxes */ static int ip_input_filter(newtComponent entry, void * data, int ch, int cur= sor) @@ -64,6 +65,7 @@ int changeaddress(struct keyvalue *kv, char *colour, int ty= peflag, newtComponent gatewaylabel; newtComponent dhcphostnamelabel; newtComponent dhcpforcemtulabel; + newtComponent dhcprapidcommitlabel; newtComponent ok, cancel;=09 char message[1000]; char temp[STRING_SIZE]; @@ -73,6 +75,8 @@ int changeaddress(struct keyvalue *kv, char *colour, int ty= peflag, char typefield[STRING_SIZE]; char dhcphostnamefield[STRING_SIZE]; char dhcpforcemtufield[STRING_SIZE]; + char dhcprapidcommitfield[STRING_SIZE]; + char enablerapidcommit; int error; int result =3D 0; char type[STRING_SIZE]; @@ -88,9 +92,10 @@ int changeaddress(struct keyvalue *kv, char *colour, int t= ypeflag, sprintf(typefield, "%s_TYPE", colour); sprintf(dhcphostnamefield, "%s_DHCP_HOSTNAME", colour); sprintf(dhcpforcemtufield, "%s_DHCP_FORCE_MTU", colour); + sprintf(dhcprapidcommitfield, "%s_DHCP_RAPID_COMMIT", colour); =09 sprintf(message, _("Interface - %s"), colour); - newtCenteredWindow(44, (typeflag ? 19 : 12), message); + newtCenteredWindow(44, (typeflag ? 20 : 12), message); =09 networkform =3D newtForm(NULL, NULL, 0); =20 @@ -102,6 +107,15 @@ int changeaddress(struct keyvalue *kv, char *colour, int= typeflag, * of the window down two rows to make room. */ if (typeflag) { + *temp =3D '\0'; + + // Find RapidCommit setting + findkey(kv, dhcprapidcommitfield, temp); + if (strcmp(temp, "yes") =3D=3D 0 || strcmp(temp, "true") =3D=3D 0 || strcm= p(temp, "on") =3D=3D 0 || strcmp(temp, "") =3D=3D 0) + enablerapidcommit =3D '*'; + else + enablerapidcommit =3D ' '; + strcpy(temp, "STATIC"); findkey(kv, typefield, temp); if (strcmp(temp, "STATIC") =3D=3D 0) startstatictype =3D 1; if (strcmp(temp, "DHCP") =3D=3D 0) startdhcptype =3D 1; @@ -119,28 +133,35 @@ int changeaddress(struct keyvalue *kv, char *colour, in= t typeflag, newtTextboxSetText(dhcphostnamelabel, _("DHCP Hostname:")); dhcpforcemtulabel =3D newtTextbox(2, 9, 18, 1, 0); newtTextboxSetText(dhcpforcemtulabel, _("Force DHCP MTU:")); + dhcprapidcommitlabel =3D newtTextbox(2, 10, 18, 1, 0); + newtTextboxSetText(dhcprapidcommitlabel, _("Rapid Commit:")); strcpy(temp, defaultdhcphostname); findkey(kv, dhcphostnamefield, temp); dhcphostnameentry =3D newtEntry(20, 8, temp, 20, &dhcphostnameresult, 0); strcpy(temp, ""); findkey(kv, dhcpforcemtufield, temp); dhcpforcemtuentry =3D newtEntry(20, 9, temp, 20, &dhcpforcemturesult, 0); + dhcprapidcommitentry =3D newtCheckbox(20, 10, "", enablerapidcommit, " *",= &enablerapidcommit); + newtComponentAddCallback(dhcprapidcommitentry, networkdialogcallbacktype, = NULL); newtFormAddComponent(networkform, dhcphostnamelabel); newtFormAddComponent(networkform, dhcphostnameentry); newtFormAddComponent(networkform, dhcpforcemtulabel); newtFormAddComponent(networkform, dhcpforcemtuentry); + newtFormAddComponent(networkform, dhcprapidcommitlabel); + newtFormAddComponent(networkform, dhcprapidcommitentry); if (startdhcptype =3D=3D 0) { newtEntrySetFlags(dhcphostnameentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); newtEntrySetFlags(dhcpforcemtuentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); + newtCheckboxSetFlags(dhcprapidcommitentry, NEWT_FLAG_DISABLED, NEWT_FLAG= S_SET); } } /* Address */ - addresslabel =3D newtTextbox(2, (typeflag ? 11 : 4) + 0, 18, 1, 0); + addresslabel =3D newtTextbox(2, (typeflag ? 12 : 4) + 0, 18, 1, 0); newtTextboxSetText(addresslabel, _("IP address:")); strcpy(temp, ""); findkey(kv, addressfield, temp); - addressentry =3D newtEntry(20, (typeflag ? 11 : 4) + 0, temp, 20, &addressr= esult, 0); + addressentry =3D newtEntry(20, (typeflag ? 12 : 4) + 0, temp, 20, &addressr= esult, 0); newtEntrySetFilter(addressentry, ip_input_filter, NULL); if (typeflag =3D=3D 1 && startstatictype =3D=3D 0) newtEntrySetFlags(addressentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); @@ -148,10 +169,10 @@ int changeaddress(struct keyvalue *kv, char *colour, in= t typeflag, newtFormAddComponent(networkform, addressentry); =09 /* Netmask */ - netmasklabel =3D newtTextbox(2, (typeflag ? 11 : 4) + 1, 18, 1, 0); + netmasklabel =3D newtTextbox(2, (typeflag ? 12 : 4) + 1, 18, 1, 0); newtTextboxSetText(netmasklabel, _("Network mask:")); strcpy(temp, "255.255.255.0"); findkey(kv, netmaskfield, temp); - netmaskentry =3D newtEntry(20, (typeflag ? 11 : 4) + 1, temp, 20, &netmaskr= esult, 0); + netmaskentry =3D newtEntry(20, (typeflag ? 12 : 4) + 1, temp, 20, &netmaskr= esult, 0); newtEntrySetFilter(netmaskentry, ip_input_filter, NULL); if (typeflag =3D=3D 1 && startstatictype =3D=3D 0)=20 newtEntrySetFlags(netmaskentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); @@ -162,11 +183,11 @@ int changeaddress(struct keyvalue *kv, char *colour, in= t typeflag, if (typeflag) { /* Gateway */ - gatewaylabel =3D newtTextbox(2, (typeflag ? 11 : 4) + 2, 18, 1, 0); + gatewaylabel =3D newtTextbox(2, (typeflag ? 12 : 4) + 2, 18, 1, 0); newtTextboxSetText(gatewaylabel, _("Gateway:")); strcpy(temp, ""); findkey(kv, gatewayfield, temp); - gatewayentry =3D newtEntry(20, (typeflag ? 11 : 4) + 2, temp, 20, &gateway= result, 0); + gatewayentry =3D newtEntry(20, (typeflag ? 12 : 4) + 2, temp, 20, &gateway= result, 0); newtEntrySetFilter(gatewayentry, ip_input_filter, NULL); if (typeflag =3D=3D 1 && startstatictype =3D=3D 0) newtEntrySetFlags(gatewayentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); @@ -175,8 +196,8 @@ int changeaddress(struct keyvalue *kv, char *colour, int = typeflag, } =20 /* Buttons. */ - ok =3D newtButton(8, (typeflag ? 15 : 7), _("OK")); - cancel =3D newtButton(26, (typeflag ? 15 : 7), _("Cancel")); + ok =3D newtButton(8, (typeflag ? 16 : 7), _("OK")); + cancel =3D newtButton(26, (typeflag ? 16 : 7), _("Cancel")); =20 newtFormAddComponents(networkform, ok, cancel, NULL); =20 @@ -237,6 +258,12 @@ int changeaddress(struct keyvalue *kv, char *colour, int= typeflag, { replacekeyvalue(kv, dhcphostnamefield, dhcphostnameresult); replacekeyvalue(kv, dhcpforcemtufield, dhcpforcemturesult); + + if (enablerapidcommit =3D=3D '*') + replacekeyvalue(kv, dhcprapidcommitfield, "on"); + else + replacekeyvalue(kv, dhcprapidcommitfield, "off"); + if (strcmp(type, "STATIC") !=3D 0) { replacekeyvalue(kv, addressfield, "0.0.0.0"); @@ -352,11 +379,13 @@ void networkdialogcallbacktype(newtComponent cm, void *= data) { newtEntrySetFlags(dhcphostnameentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_RESET); newtEntrySetFlags(dhcpforcemtuentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_RESET); + newtCheckboxSetFlags(dhcprapidcommitentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_= RESET); } else { newtEntrySetFlags(dhcphostnameentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); = =09 newtEntrySetFlags(dhcpforcemtuentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET); = =09 + newtCheckboxSetFlags(dhcprapidcommitentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_= SET); } newtRefresh(); newtDrawForm(networkform); --=20 2.39.5 --===============0809003377821735761==--