b3e8f51a2e
Radvd has been updated to 1.8.5 a few months ago, while Openwrt still uses 1.8.3. http://www.litech.org/radvd/ This patch updates radvd to 1.8.5. No major changes required. signed off by: hannu.nyman@iki.fi I send the patch again to make sure that Windows does not mess with LFs... (not sure if that is needed, but Patchwork shows the previous one strangely) git-svn-id: svn://svn.openwrt.org/openwrt/packages@32565 3c298f89-4303-0410-b956-a3cf2f4a3e73
68 lines
1.4 KiB
Diff
68 lines
1.4 KiB
Diff
--- a/netlink.c
|
|
+++ b/netlink.c
|
|
@@ -63,7 +63,7 @@ void process_netlink_msg(int sock)
|
|
else {
|
|
dlog(LOG_DEBUG, 3, "%s, ifindex %d, flags is *NOT* running", ifname, ifinfo->ifi_index);
|
|
}
|
|
- reload_config();
|
|
+ reload_config(LOG_DEBUG);
|
|
}
|
|
}
|
|
|
|
--- a/radvd.c
|
|
+++ b/radvd.c
|
|
@@ -456,7 +456,7 @@ void main_loop(void)
|
|
if (sighup_received)
|
|
{
|
|
dlog(LOG_INFO, 3, "sig hup received.\n");
|
|
- reload_config();
|
|
+ reload_config(LOG_INFO);
|
|
sighup_received = 0;
|
|
}
|
|
|
|
@@ -565,11 +565,11 @@ stop_adverts(void)
|
|
}
|
|
}
|
|
|
|
-void reload_config(void)
|
|
+void reload_config(int loglevel)
|
|
{
|
|
struct Interface *iface;
|
|
|
|
- flog(LOG_INFO, "attempting to reread config file");
|
|
+ flog(loglevel, "attempting to reread config file");
|
|
|
|
iface=IfaceList;
|
|
while(iface)
|
|
@@ -639,7 +639,7 @@ void reload_config(void)
|
|
config_interface();
|
|
kickoff_adverts();
|
|
|
|
- flog(LOG_INFO, "resuming normal operation");
|
|
+ flog(loglevel, "resuming normal operation");
|
|
}
|
|
|
|
void
|
|
--- a/radvd.h
|
|
+++ b/radvd.h
|
|
@@ -185,7 +185,7 @@ int yylex(void);
|
|
|
|
/* radvd.c */
|
|
int check_ip6_forwarding(void);
|
|
-void reload_config(void);
|
|
+void reload_config(int);
|
|
void reset_prefix_lifetimes(void);
|
|
|
|
/* timer.c */
|
|
--- a/send.c
|
|
+++ b/send.c
|
|
@@ -153,7 +153,7 @@ send_ra(struct Interface *iface, struct
|
|
* reload_config() will kick off new timers anyway. This avoids
|
|
* timer list corruption.
|
|
*/
|
|
- reload_config();
|
|
+ reload_config(LOG_INFO);
|
|
return -1;
|
|
}
|
|
}
|