diff options
| author | John Hay <jhay@FreeBSD.org> | 2010-05-22 07:38:37 +0000 |
|---|---|---|
| committer | John Hay <jhay@FreeBSD.org> | 2010-05-22 07:38:37 +0000 |
| commit | 55c91a264d94887e20c9f518744a423372bd7859 (patch) | |
| tree | 1678c047225deed9b74a6baebbb9ffb7798326ae /net/olsrd/files | |
| parent | 052da2fa7106927e9d564742c9eb30f51584e659 (diff) | |
Upgrade to olsrd 0.6.0.
Notes
Notes:
svn path=/head/; revision=254814
Diffstat (limited to 'net/olsrd/files')
| -rw-r--r-- | net/olsrd/files/patch-Makefile | 19 | ||||
| -rw-r--r-- | net/olsrd/files/patch-mcast | 29 |
2 files changed, 39 insertions, 9 deletions
diff --git a/net/olsrd/files/patch-Makefile b/net/olsrd/files/patch-Makefile index 688f69fb3eb8..554192a7e788 100644 --- a/net/olsrd/files/patch-Makefile +++ b/net/olsrd/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2008-01-02 16:00:15.000000000 +0200 -+++ Makefile 2008-01-04 12:23:05.000000000 +0200 -@@ -102,15 +102,15 @@ +--- Makefile.orig 2010-05-13 12:52:55.000000000 +0200 ++++ Makefile 2010-05-16 15:51:06.904944901 +0200 +@@ -109,15 +109,16 @@ install_olsrd: install_bin @echo ========= C O N F I G U R A T I O N - F I L E ============ @echo $(EXENAME) uses the configfile $(CFGFILE) @@ -10,16 +10,17 @@ - @echo so install a configfile with activated link quality exstensions - @echo per default. - @echo can be found at files/olsrd.conf.default.lq -+ @echo a default configfile. Sample config files are -+ @echo installed as $(CFGFILE).rfc, $(CFGFILE).lq and -+ @echo $(CFGFILE).lq-fishey ++ @echo a default configfile. Sample config files are installed ++ @echo as $(CFGFILE).default.full, $(CFGFILE).default.rfc, ++ @echo $(CFGFILE).default.lq and $(CFGFILE).default.lq-fisheye + @echo copy and edit one of these to $(CFGFILE) @echo ========================================================== mkdir -p $(ETCDIR) - -cp -i files/olsrd.conf.default.lq $(CFGFILE) -+ -cp files/olsrd.conf.default.rfc $(CFGFILE).rfc -+ -cp files/olsrd.conf.default.lq $(CFGFILE).lq -+ -cp files/olsrd.conf.default.lq-fisheye $(CFGFILE).lq-fisheye ++ -cp files/olsrd.conf.default.full $(CFGFILE).default.full ++ -cp files/olsrd.conf.default.rfc $(CFGFILE).default.rfc ++ -cp files/olsrd.conf.default.lq $(CFGFILE).default.lq ++ -cp files/olsrd.conf.default.lq-fisheye $(CFGFILE).default.lq-fisheye @echo ------------------------------------------- @echo Edit $(CFGFILE) before running olsrd!! @echo ------------------------------------------- diff --git a/net/olsrd/files/patch-mcast b/net/olsrd/files/patch-mcast new file mode 100644 index 000000000000..cf26201e75b0 --- /dev/null +++ b/net/olsrd/files/patch-mcast @@ -0,0 +1,29 @@ +--- src/bsd/net.c.orig 2010-01-13 16:49:47.000000000 +0000 ++++ src/bsd/net.c 2010-02-10 10:55:16.582716012 +0000 +@@ -494,6 +494,8 @@ + mcastreq.ipv6mr_multiaddr = ifs->int6_multaddr.sin6_addr; + mcastreq.ipv6mr_interface = ifs->if_index; + ++if (ifs->olsr_socket == sock) { ++ + OLSR_PRINTF(3, "Interface %s joining multicast %s...", ifs->int_name, + olsr_ip_to_string(&addrstr, (union olsr_ip_addr *)&ifs->int6_multaddr.sin6_addr)); + +@@ -509,6 +511,7 @@ + perror("Join multicast send"); + return -1; + } ++} + + if (setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, (char *)&mcastreq.ipv6mr_interface, sizeof(mcastreq.ipv6mr_interface)) < 0) { + perror("Set multicast if"); +--- src/unix/ifnet.c.orig 2010-01-17 17:32:53.000000000 +0000 ++++ src/unix/ifnet.c 2010-02-10 10:55:54.958215804 +0000 +@@ -840,6 +840,7 @@ + ifp->send_socket = getsocket6(0, ifp); + + join_mcast(ifp, ifp->olsr_socket); ++ join_mcast(ifp, ifp->send_socket); + + if (ifp->olsr_socket < 0) { + fprintf(stderr, "Could not initialize socket... exiting!\n\n"); |