diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /ripd/ripd.c | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2 quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz | |
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'ripd/ripd.c')
| -rw-r--r-- | ripd/ripd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ripd/ripd.c b/ripd/ripd.c index 62d8691c..632d338e 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -76,7 +76,7 @@ enum }; /* RIP command strings. */ -struct message rip_msg[] = +static const struct message rip_msg[] = { {RIP_REQUEST, "REQUEST"}, {RIP_RESPONSE, "RESPONSE"}, @@ -84,6 +84,10 @@ struct message rip_msg[] = {RIP_TRACEOFF, "TRACEOFF"}, {RIP_POLL, "POLL"}, {RIP_POLL_ENTRY, "POLL ENTRY"}, +<<<<<<< HEAD:ripd/ripd.c +======= + {0, NULL}, +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:ripd/ripd.c }; /* Utility function to set boradcast option to the socket. */ @@ -3508,7 +3512,7 @@ DEFUN (show_ip_rip_status, struct listnode *node; struct interface *ifp; struct rip_interface *ri; - extern struct message ri_version_msg[]; + extern const struct message ri_version_msg[]; const char *send_version; const char *receive_version; |