aboutsummaryrefslogtreecommitdiffstats
path: root/net/pimdd/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/pimdd/files')
-rw-r--r--net/pimdd/files/patch-Makefile13
-rw-r--r--net/pimdd/files/patch-igmp.c14
-rw-r--r--net/pimdd/files/patch-pim_proto.c11
3 files changed, 36 insertions, 2 deletions
diff --git a/net/pimdd/files/patch-Makefile b/net/pimdd/files/patch-Makefile
index df7f0e9d9b2a..9e68a532833c 100644
--- a/net/pimdd/files/patch-Makefile
+++ b/net/pimdd/files/patch-Makefile
@@ -1,5 +1,14 @@
---- Makefile.orig Fri Sep 29 11:53:31 2006
-+++ Makefile Fri Sep 29 11:53:50 2006
+--- Makefile.orig 1999-11-30 18:58:53.000000000 +0100
++++ Makefile 2013-09-08 09:39:18.947517833 +0200
+@@ -53,7 +53,7 @@
+ # Support for Resource Reservations), currently used by RSVP.
+ RSRRDEF= -DRSRR
+
+-CC = gcc
++#CC = gcc
+ MCAST_INCLUDE= -Iinclude
+ LDFLAGS=
+
@@ -63,7 +63,7 @@
#CONFIGCONFIGCONFIG
### Compilation flags for different platforms. Uncomment only one of them
diff --git a/net/pimdd/files/patch-igmp.c b/net/pimdd/files/patch-igmp.c
new file mode 100644
index 000000000000..bc6ea80785c6
--- /dev/null
+++ b/net/pimdd/files/patch-igmp.c
@@ -0,0 +1,14 @@
+--- igmp.c.orig 2014-01-22 00:05:49.560452946 +0100
++++ igmp.c 2014-01-22 00:06:57.098508699 +0100
+@@ -168,7 +168,11 @@
+ #ifdef RAW_INPUT_IS_RAW
+ ipdatalen = ntohs(ip->ip_len) - iphdrlen;
+ #else
++ #if __FreeBSD_version >= 1000000
++ ipdatalen = ip->ip_len - iphdrlen;
++ #else
+ ipdatalen = ip->ip_len;
++ #endif
+ #endif
+ if (iphdrlen + ipdatalen != recvlen) {
+ log(LOG_WARNING, 0,
diff --git a/net/pimdd/files/patch-pim_proto.c b/net/pimdd/files/patch-pim_proto.c
new file mode 100644
index 000000000000..c53844747ec0
--- /dev/null
+++ b/net/pimdd/files/patch-pim_proto.c
@@ -0,0 +1,11 @@
+--- pim_proto.c.orig 2014-01-26 12:48:37.048478574 +0100
++++ pim_proto.c 2014-01-26 12:51:08.180470630 +0100
+@@ -669,7 +669,7 @@
+ "\tPRUNE src %s, group %s - scheduling delayed join",
+ inet_fmt(source, s1), inet_fmt(group, s2));
+
+- schedule_delayed_join(mrtentry_ptr, uni_target_addr);
++ schedule_delayed_join(mrtentry_ptr, uni_target_addr.unicast_addr);
+ }
+ }
+