summaryrefslogtreecommitdiff
path: root/net/openospfd/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/openospfd/files')
-rw-r--r--net/openospfd/files/patch-ospfctl_parser.c26
-rw-r--r--net/openospfd/files/patch-ospfctl_parser.h26
-rw-r--r--net/openospfd/files/patch-ospfd_kroute.c36
3 files changed, 88 insertions, 0 deletions
diff --git a/net/openospfd/files/patch-ospfctl_parser.c b/net/openospfd/files/patch-ospfctl_parser.c
new file mode 100644
index 000000000000..c4f7fc886d01
--- /dev/null
+++ b/net/openospfd/files/patch-ospfctl_parser.c
@@ -0,0 +1,26 @@
+--- ospfctl/parser.c.orig Fri Jul 27 15:11:46 2007
++++ ospfctl/parser.c Fri Jul 27 15:12:01 2007
+@@ -32,23 +32,6 @@
+
+ #include "parser.h"
+
+-enum token_type {
+- NOTOKEN,
+- ENDTOKEN,
+- KEYWORD,
+- ADDRESS,
+- FLAG,
+- PREFIX,
+- IFNAME
+-};
+-
+-struct token {
+- enum token_type type;
+- const char *keyword;
+- int value;
+- const struct token *next;
+-};
+-
+ static const struct token t_main[];
+ static const struct token t_fib[];
+ static const struct token t_show[];
diff --git a/net/openospfd/files/patch-ospfctl_parser.h b/net/openospfd/files/patch-ospfctl_parser.h
new file mode 100644
index 000000000000..b4eab4960d00
--- /dev/null
+++ b/net/openospfd/files/patch-ospfctl_parser.h
@@ -0,0 +1,26 @@
+--- ospfctl/parser.h.orig Fri Jul 27 15:11:55 2007
++++ ospfctl/parser.h Fri Jul 27 15:12:01 2007
+@@ -50,6 +50,23 @@
+ RELOAD
+ };
+
++enum token_type {
++ NOTOKEN,
++ ENDTOKEN,
++ KEYWORD,
++ ADDRESS,
++ FLAG,
++ PREFIX,
++ IFNAME
++};
++
++struct token {
++ enum token_type type;
++ const char *keyword;
++ int value;
++ const struct token *next;
++};
++
+ struct parse_result {
+ struct in_addr addr;
+ char ifname[IF_NAMESIZE];
diff --git a/net/openospfd/files/patch-ospfd_kroute.c b/net/openospfd/files/patch-ospfd_kroute.c
new file mode 100644
index 000000000000..6415a3b80316
--- /dev/null
+++ b/net/openospfd/files/patch-ospfd_kroute.c
@@ -0,0 +1,36 @@
+--- ospfd/kroute.c.orig Mon Nov 20 14:41:22 2006
++++ ospfd/kroute.c Mon Nov 20 14:42:17 2006
+@@ -875,10 +875,6 @@
+ send_rtmsg(kr_state.fd, RTM_DELETE, &kr->r);
+ free(kr);
+ } else {
+- if ((label = (struct sockaddr_rtlabel *)
+- rti_info[RTAX_LABEL]) != NULL)
+- kr->r.rtlabel =
+- rtlabel_name2id(label->sr_label);
+ kroute_insert(kr);
+ }
+
+@@ -1075,10 +1071,6 @@
+
+ rtlabel_unref(kr->r.rtlabel);
+ kr->r.rtlabel = 0;
+- if ((label = (struct sockaddr_rtlabel *)
+- rti_info[RTAX_LABEL]) != NULL)
+- kr->r.rtlabel =
+- rtlabel_name2id(label->sr_label);
+
+ if (kif_validate(kr->r.ifindex))
+ kr->r.flags &= ~F_DOWN;
+@@ -1098,11 +1090,6 @@
+ kr->r.nexthop.s_addr = nexthop.s_addr;
+ kr->r.flags = flags;
+ kr->r.ifindex = ifindex;
+-
+- if ((label = (struct sockaddr_rtlabel *)
+- rti_info[RTAX_LABEL]) != NULL)
+- kr->r.rtlabel =
+- rtlabel_name2id(label->sr_label);
+
+ kroute_insert(kr);
+ }