Changeset 9303

Timestamp:

03/12/08 18:00:53 (5 years ago)

Author:

BrainSlayer

Message:

fix unresolved symbols and reenable watchdog for mr3202a

Location:

src/router

Files:

• rc/Makefile (modified) (1 diff)
• rc/pptpd.c (added)
• rc/rc.c (modified) (1 diff)
• services/Makefile (modified) (1 diff)
• services/services/wland.c (modified) (1 diff)
• services/sysinit/sysinit-mr3202a.c (modified) (1 diff)
• services/tools/pptpd.c (deleted)

src/router/rc/Makefile

@@ -28 +28 @@
 
 OBJS := rc.o init.o servicemanager.o services.o stats.o crc.o http.o
-OBJS += resetbutton.o ntp.o listen.o check_ps.o process_monitor.o radio_timer.o watchdog.o event.o nvram.o ledtool.o ttraff.o
+OBJS += resetbutton.o ntp.o listen.o check_ps.o process_monitor.o radio_timer.o watchdog.o event.o nvram.o ledtool.o ttraff.o pptpd.o
 
 REWRITE_REVISION_H1 := $(shell echo -n '\#define SVN_REVISION "' > revision.h)

src/router/rc/rc.c

@@ -620 +620 @@
   /* poptop [ stop start restart ]  */
   else if (strstr (base, "poptop"))
-    return start_main("pptpd",argc, argv);
+    return pptpd_main(argc,argv);
 #endif
 #ifndef HAVE_RB500

src/router/services/Makefile

@@ -425 +425 @@
 CFLAGS += -DHAVE_PPTPD
 OBJS += pptp.o
-OBJS += pptpd.o
 endif
 

src/router/services/services/wland.c

@@ -285 +285 @@
 //  if (nvram_match ("apwatchdog_enable", "1"))
 //    do_ap_watchdog ();
-  start_service ("wds_check");
+  start_wds_check();
 //  do_wds_check ();
 

src/router/services/sysinit/sysinit-mr3202a.c

@@ -92 +92 @@
   mkdir ("/var/tmp", 0777);
   cprintf ("sysinit() setup console\n");
-//  eval ("/sbin/watchdog");
+  eval ("/sbin/watchdog");
   /* Setup console */