diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/dhcpv6/patches/patch-src_relay6_socket_c | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/dhcpv6/patches/patch-src_relay6_socket_c')
| -rw-r--r-- | package/dhcpv6/patches/patch-src_relay6_socket_c | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/package/dhcpv6/patches/patch-src_relay6_socket_c b/package/dhcpv6/patches/patch-src_relay6_socket_c new file mode 100644 index 000000000..c5f37d926 --- /dev/null +++ b/package/dhcpv6/patches/patch-src_relay6_socket_c @@ -0,0 +1,48 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- dhcpv6-1.2.0.orig/src/relay6_socket.c 2009-04-03 00:53:38.000000000 +0200 ++++ dhcpv6-1.2.0/src/relay6_socket.c 2009-05-28 23:09:11.155499136 +0200 +@@ -399,7 +399,7 @@ int send_message() { + if (mesg->sent == 1) + return 0; + +- bzero((char *) &sin6, sizeof(struct sockaddr_in6)); ++ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6)); + sin6.sin6_family = AF_INET6; + sin6.sin6_flowinfo = 0; + sin6.sin6_scope_id = 0; +@@ -494,7 +494,7 @@ int send_message() { + if (mesg->msg_type == DH6_RELAY_FORW) { + for (ipv6uni = IPv6_uniaddr_list.next; ipv6uni != &IPv6_uniaddr_list; + ipv6uni = ipv6uni->next) { +- bzero((char *) &sin6, sizeof(struct sockaddr_in6)); ++ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6)); + sin6.sin6_family = AF_INET6; + + memset(dest_addr, 0, INET6_ADDRSTRLEN); +@@ -564,7 +564,7 @@ int send_message() { + iface = iface->next) { + uservers = iface->sname; + while (uservers != NULL) { +- bzero((char *) &sin6, sizeof(struct sockaddr_in6)); ++ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6)); + sin6.sin6_family = AF_INET6; + + memset(dest_addr, 0, INET6_ADDRSTRLEN); +@@ -644,7 +644,7 @@ int send_message() { + + for (si = sifaces_list.next; si != &sifaces_list; si = si->next) { + *(mesg->hc_pointer) = MAXHOPCOUNT; +- bzero((char *) &sin6, sizeof(struct sockaddr_in6)); ++ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6)); + sin6.sin6_family = AF_INET6; + + memset(dest_addr, 0, INET6_ADDRSTRLEN); +@@ -734,7 +734,7 @@ int send_message() { + continue; + + *(mesg->hc_pointer) = MAXHOPCOUNT; +- bzero((char *) &sin6, sizeof(struct sockaddr_in6)); ++ memset((char *) &sin6, 0, sizeof(struct sockaddr_in6)); + sin6.sin6_family = AF_INET6; + + memset(dest_addr, 0, INET6_ADDRSTRLEN); |