mrd6: refresh patches

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
This commit is contained in:
Alexander Couzens 2017-12-02 01:42:15 +01:00
parent 0d1c5f77d4
commit 1c6ef01fe2
3 changed files with 7 additions and 21 deletions

View file

@ -1,7 +1,5 @@
Index: mrd6-0.9.5/include/mrdpriv/linux/netlink_missing_defs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ mrd6-0.9.5/include/mrdpriv/linux/netlink_missing_defs.h 2007-09-21 13:19:06.000000000 +0200
--- /dev/null
+++ b/include/mrdpriv/linux/netlink_missing_defs.h
@@ -0,0 +1,41 @@
+#include <linux/version.h>
+
@ -44,10 +42,8 @@ Index: mrd6-0.9.5/include/mrdpriv/linux/netlink_missing_defs.h
+#endif
+
+#endif
Index: mrd6-0.9.5/src/linux/linux_unicast_route.cpp
===================================================================
--- mrd6-0.9.5.orig/src/linux/linux_unicast_route.cpp 2007-09-21 13:19:05.000000000 +0200
+++ mrd6-0.9.5/src/linux/linux_unicast_route.cpp 2007-09-21 13:19:06.000000000 +0200
--- a/src/linux/linux_unicast_route.cpp
+++ b/src/linux/linux_unicast_route.cpp
@@ -23,6 +23,7 @@
*/

View file

@ -7,11 +7,9 @@ Subject: [PATCH 1/2] Accept default routes without RTA_DST
src/linux/linux_unicast_route.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/linux/linux_unicast_route.cpp b/src/linux/linux_unicast_route.cpp
index 331a7a0..7919cc2 100644
--- a/src/linux/linux_unicast_route.cpp
+++ b/src/linux/linux_unicast_route.cpp
@@ -334,7 +334,7 @@ void linux_unicast_router::handle_route_event(bool isnew, nlmsghdr *hdr) {
@@ -335,7 +335,7 @@ void linux_unicast_router::handle_route_
netlink_msg::parse_rtatable(tb, RTA_MAX, RTM_RTA(NLMSG_DATA(hdr)),
hdr->nlmsg_len - NLMSG_LENGTH(sizeof(rtmsg)));
@ -20,7 +18,7 @@ index 331a7a0..7919cc2 100644
lookup_result res;
parse_prefix_rec(tb, msg->r.rtm_dst_len,
@@ -360,7 +360,7 @@ void linux_unicast_router::handle_route_event(bool isnew, nlmsghdr *hdr) {
@@ -361,7 +361,7 @@ void linux_unicast_router::handle_route_
}
prefix_changed(isnew, res);
@ -29,6 +27,3 @@ index 331a7a0..7919cc2 100644
}
void linux_unicast_router::handle_intf_event(bool isnew, nlmsghdr *hdr) {
--
1.9.0

View file

@ -7,11 +7,9 @@ Subject: [PATCH 2/2] Metric should be more important than distance at lookup
src/mrib.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mrib.cpp b/src/mrib.cpp
index e51fed7..707d601 100644
--- a/src/mrib.cpp
+++ b/src/mrib.cpp
@@ -327,16 +327,16 @@ mrib_def::mrib_node *mrib_def::prefix_lookup_y(const inet6_addr &source) const {
@@ -327,16 +327,16 @@ mrib_def::mrib_node *mrib_def::prefix_lo
void mrib_def::insert_prefix_in_node(mrib_node *n, prefix *p) {
prefix *curr = n->head, *prev = 0;
@ -33,6 +31,3 @@ index e51fed7..707d601 100644
prev = curr;
curr = curr->next;
}
--
1.9.0