diff options
| author | Denis Ovsienko <linux@pilot.org.ua> | 2007-09-14 14:56:28 +0000 |
|---|---|---|
| committer | Denis Ovsienko <linux@pilot.org.ua> | 2007-09-14 14:56:28 +0000 |
| commit | 96934e6ac6ec9ff6e67131cc8324741b771d5e0d (patch) | |
| tree | 7cb90f6a03e1b33e2e0045cc50185b16dfe00df8 /zebra | |
| parent | 91b7351d4e150bbc60786f0facb911fa2c598553 (diff) | |
+ sayonara old_pid!
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/ChangeLog | 5 | ||||
| -rw-r--r-- | zebra/kernel_socket.c | 3 | ||||
| -rw-r--r-- | zebra/main.c | 4 | ||||
| -rw-r--r-- | zebra/test_main.c | 4 | ||||
| -rw-r--r-- | zebra/zserv.h | 1 |
5 files changed, 6 insertions, 11 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog index 3d5dfd47..2969439d 100644 --- a/zebra/ChangeLog +++ b/zebra/ChangeLog @@ -7,6 +7,11 @@ * kernel_socket.[ch]: We don't need rtm_type_str_max any more. * main.c: (main) Don't call rib_sweep_route() before the pidfile is acquired, this fixes bug #402. + * zserv.h: Dropped old_pid, since it's useless now. This + fixes bug #381. + * main.c: (main) Idem. + * test_main.c: (main) Idem. + * kernel_socket.c: (rtm_read) Idem. 2007-09-12 Denis Ovsienko diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c index df2b5d80..cb23bf9f 100644 --- a/zebra/kernel_socket.c +++ b/zebra/kernel_socket.c @@ -799,8 +799,7 @@ rtm_read (struct rt_msghdr *rtm) * At the same time, ignore unconfirmed messages, they should be tracked * by rtm_write() and kernel_rtm_ipv4(). */ - if (rtm->rtm_type != RTM_GET - && (rtm->rtm_pid == pid || rtm->rtm_pid == old_pid)) + if (rtm->rtm_type != RTM_GET && rtm->rtm_pid == pid) { char buf[INET_ADDRSTRLEN], gate_buf[INET_ADDRSTRLEN]; int ret; diff --git a/zebra/main.c b/zebra/main.c index 2f966523..6019260f 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -47,7 +47,6 @@ struct zebra_t zebrad = }; /* process id. */ -pid_t old_pid; pid_t pid; /* Pacify zclient.o in libzebra, which expects this variable. */ @@ -366,9 +365,6 @@ main (int argc, char **argv) if (batch_mode) exit (0); - /* Needed for BSD routing socket. */ - old_pid = getpid (); - /* Daemonize. */ if (daemon_mode) daemon (0, 0); diff --git a/zebra/test_main.c b/zebra/test_main.c index 59cec462..46f73bbe 100644 --- a/zebra/test_main.c +++ b/zebra/test_main.c @@ -43,7 +43,6 @@ struct zebra_t zebrad = }; /* process id. */ -pid_t old_pid; pid_t pid; /* zebra_rib's workqueue hold time. Private export for use by test code only */ @@ -313,9 +312,6 @@ main (int argc, char **argv) if (batch_mode) exit (0); - /* Needed for BSD routing socket. */ - old_pid = getpid (); - /* Daemonize. */ if (daemon_mode) daemon (0, 0); diff --git a/zebra/zserv.h b/zebra/zserv.h index 68c26f23..5e223776 100644 --- a/zebra/zserv.h +++ b/zebra/zserv.h @@ -107,6 +107,5 @@ extern int zsend_route_multipath (int, struct zserv *, struct prefix *, extern int zsend_router_id_update(struct zserv *, struct prefix *); extern pid_t pid; -extern pid_t old_pid; #endif /* _ZEBRA_ZEBRA_H */ |