patches/deluge-04-sockaddr.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 1012 8adc7475afcf
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1012
8adc7475afcf 2008-03-27 Albert Lee <[email protected]>
trisk
parents: 1011
diff changeset
     1
--- deluge-torrent-0.5.8.7.orig/libtorrent/src/enum_net.cpp	Thu Mar 27 07:58:06 2008
8adc7475afcf 2008-03-27 Albert Lee <[email protected]>
trisk
parents: 1011
diff changeset
     2
+++ deluge-torrent-0.5.8.7/libtorrent/src/enum_net.cpp	Thu Mar 27 08:00:47 2008
8adc7475afcf 2008-03-27 Albert Lee <[email protected]>
trisk
parents: 1011
diff changeset
     3
@@ -34,6 +34,7 @@
8adc7475afcf 2008-03-27 Albert Lee <[email protected]>
trisk
parents: 1011
diff changeset
     4
 #include "asio/ip/host_name.hpp"
8adc7475afcf 2008-03-27 Albert Lee <[email protected]>
trisk
parents: 1011
diff changeset
     5
 
8adc7475afcf 2008-03-27 Albert Lee <[email protected]>
trisk
parents: 1011
diff changeset
     6
 #if defined TORRENT_BSD || defined TORRENT_LINUX
8adc7475afcf 2008-03-27 Albert Lee <[email protected]>
trisk
parents: 1011
diff changeset
     7
+#include <string.h>
1011
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
     8
 #include <sys/ioctl.h>
1012
8adc7475afcf 2008-03-27 Albert Lee <[email protected]>
trisk
parents: 1011
diff changeset
     9
 #include <sys/socket.h>
1011
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    10
 #include <netinet/in.h>
1012
8adc7475afcf 2008-03-27 Albert Lee <[email protected]>
trisk
parents: 1011
diff changeset
    11
@@ -156,9 +157,9 @@
1011
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    12
 				ret.push_back(iface);
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    13
 			}
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    14
 
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    15
-#if defined TORRENT_BSD
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    16
+#if defined TORRENT_BSD && defined BSD4_4
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    17
 			int current_size = item.ifr_addr.sa_len + IFNAMSIZ;
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    18
-#elif defined TORRENT_LINUX
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    19
+#elif defined TORRENT_LINUX || defined TORRENT_BSD
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    20
 			int current_size = sizeof(ifreq);
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    21
 #endif
ba657f63d907 2008-03-26 Albert Lee <[email protected]>
trisk
parents:
diff changeset
    22
 			ifr += current_size;