mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 18:19:02 +00:00
d674422a81
Update busybox to 1.28.2, refresh patches and default config. * modify 230-add_nslookup_lede.patch as opt_complementary was removed Also move nslookup_longopts variable declaration to be inside the same conditional as the function itself. * modify 250-date-k-flag.patch to match upstream (opt_complementary) * remove 600-cve-2017-16544.patch that is upstreamed Notes about config changes: * Some applet-specific LONG_OPTIONS config options were removed * Config help text indentation changed, caused lots of text formatting changes for convert_menuconfig.pl * convert_defaults.pl moved lots of defaults around, summary of actual changes below New applets/features: --------------------- ARCH HEXEDIT MINIPS NETCAT NUKE RESUME RUN_INIT SETFATTR New options: ------------ FEATURE_CATN FEATURE_CROND_SPECIAL_TIMES FEATURE_LIBBUSYBOX_STATIC FEATURE_SETPRIV_CAPABILITIES FEATURE_SETPRIV_CAPABILITY_NAMES FEATURE_SETPRIV_DUMP FEATURE_SH_READ_FRAC FEATURE_SWAPONOFF_LABEL FEATURE_VOLUMEID_MINIX FEATURE_XARGS_SUPPORT_ARGS_FILE FEATURE_XARGS_SUPPORT_PARALLEL HUSH_GETOPTS HUSH_READONLY HUSH_TIMES Removed: -------- FEATURE_HAVE_RPC MSH Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
16 lines
680 B
Diff
16 lines
680 B
Diff
--- a/networking/udhcp/dhcpc.c
|
|
+++ b/networking/udhcp/dhcpc.c
|
|
@@ -1417,6 +1417,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
|
|
/* silence "uninitialized!" warning */
|
|
unsigned timestamp_before_wait = timestamp_before_wait;
|
|
|
|
+ /* When running on a bridge, the ifindex may have changed (e.g. if
|
|
+ * member interfaces were added/removed or if the status of the
|
|
+ * bridge changed).
|
|
+ * Workaround: refresh it here before processing the next packet */
|
|
+ udhcp_read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.client_mac);
|
|
+
|
|
//bb_error_msg("sockfd:%d, listen_mode:%d", sockfd, listen_mode);
|
|
|
|
/* Was opening raw or udp socket here
|