diff options
author | 2010-02-17 15:32:35 +0000 | |
---|---|---|
committer | 2010-02-17 15:32:35 +0000 | |
commit | 4e0c6f838c7b880ce1d3de37ba91393eb67c5151 (patch) | |
tree | cca203abfecefdc0b429e83762b550429743bdeb /net-analyzer/ttt/files | |
parent | Drop per bug #175570. (diff) | |
download | gentoo-2-4e0c6f838c7b880ce1d3de37ba91393eb67c5151.tar.gz gentoo-2-4e0c6f838c7b880ce1d3de37ba91393eb67c5151.tar.bz2 gentoo-2-4e0c6f838c7b880ce1d3de37ba91393eb67c5151.zip |
Drop per bug #247940.
Diffstat (limited to 'net-analyzer/ttt/files')
-rw-r--r-- | net-analyzer/ttt/files/ttt-1.8-linux-sll.patch | 79 | ||||
-rw-r--r-- | net-analyzer/ttt/files/ttt-1.8-pcap.patch | 11 | ||||
-rw-r--r-- | net-analyzer/ttt/files/ttt-gcc4.diff | 22 |
3 files changed, 0 insertions, 112 deletions
diff --git a/net-analyzer/ttt/files/ttt-1.8-linux-sll.patch b/net-analyzer/ttt/files/ttt-1.8-linux-sll.patch deleted file mode 100644 index 4bdc3a2932cb..000000000000 --- a/net-analyzer/ttt/files/ttt-1.8-linux-sll.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- ttt-1.8/net_read.c 2003-10-16 13:55:18.000000000 +0200 -+++ ttt-1.8/net_read.c.new 2004-02-09 19:40:31.000000000 +0100 -@@ -172,6 +172,10 @@ - static void pflog_if_read(u_char *user, const struct pcap_pkthdr *h, - const u_char *p); - #endif -+#ifdef DLT_LINUX_SLL /* linux specific */ -+static void linux_sll_if_read(u_char *user, const struct pcap_pkthdr *h, -+ const u_char *p); -+#endif - static int ether_encap_read(u_short ethtype, const u_char *p, - int length, int caplen); - static int llc_read(const u_char *p, const int length, const int caplen); -@@ -664,6 +668,55 @@ - } - #endif - -+#ifdef DLT_LINUX_SLL -+ -+#define SLL_HEADER_SIZE 16 -+#define SLL_ADDRLEN 8 /* length of address field */ -+ -+struct sll_header { -+ u_int16_t sll_pkttype; /* packet type */ -+ u_int16_t sll_hatype; /* link-layer address type */ -+ u_int16_t sll_halen; /* link-layer address length */ -+ u_int8_t sll_addr[SLL_ADDRLEN]; /* link-layer address */ -+ u_int16_t sll_protocol; /* protocol */ -+}; -+ -+#define LINUX_SLL_P_802_2 0x0004 -+ -+static void -+linux_sll_if_read(u_char *user, const struct pcap_pkthdr *h, const u_char *p) -+{ -+ int caplen = h->caplen; -+ int length = h->len; -+ struct sll_header *hdr = (struct sll_header *)p; -+ int protocol; -+ -+ packet_length = length; /* save data link level packet length */ -+ if (caplen < SLL_HEADER_SIZE) { -+ return; -+ } -+ -+ p += SLL_HEADER_SIZE; -+ length -= SLL_HEADER_SIZE; -+ caplen -= SLL_HEADER_SIZE; -+ -+ protocol = ntohs(hdr->sll_protocol); -+ -+ if (protocol <= 1536) { -+ -+ switch (protocol) { -+ -+ case LINUX_SLL_P_802_2: -+ llc_read(p, length, caplen); -+ break; -+ -+ } -+ } else -+ ether_encap_read(protocol, p, length, caplen); -+} -+ -+#endif -+ - #ifdef PFLOG_HDRLEN - - static void -@@ -1094,6 +1147,9 @@ - #ifdef PFLOG_HDRLEN - { pflog_if_read, DLT_PFLOG }, - #endif -+#ifdef DLT_LINUX_SLL -+ { linux_sll_if_read, DLT_LINUX_SLL }, -+#endif - { NULL, 0 }, - }; - diff --git a/net-analyzer/ttt/files/ttt-1.8-pcap.patch b/net-analyzer/ttt/files/ttt-1.8-pcap.patch deleted file mode 100644 index 93e1437fb5b3..000000000000 --- a/net-analyzer/ttt/files/ttt-1.8-pcap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pcap_inet.c.orig 2004-02-09 14:01:54.000000000 +0100 -+++ pcap_inet.c 2004-02-09 14:02:02.000000000 +0100 -@@ -150,7 +150,7 @@ - - int - pcap_lookupnet(device, netp, maskp, errbuf) -- register char *device; -+ register const char *device; - register u_int *netp, *maskp; - register char *errbuf; - { diff --git a/net-analyzer/ttt/files/ttt-gcc4.diff b/net-analyzer/ttt/files/ttt-gcc4.diff deleted file mode 100644 index 46c08f60f283..000000000000 --- a/net-analyzer/ttt/files/ttt-gcc4.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -urN ../tmp-orig/ttt-1.7/net_names.c ./net_names.c ---- ../tmp-orig/ttt-1.7/net_names.c 2000-12-20 15:30:09.000000000 +0100 -+++ ./net_names.c 2005-02-09 14:41:36.180046553 +0100 -@@ -158,6 +158,9 @@ - return NULL; - } - -+static char *inet6_ntoa(uint32_t *addr); /* should be replaced -+ by addr2ascii */ -+ - char *net_getname(long type, long *id) - { - char *buf, *name; -@@ -258,8 +261,6 @@ - case TTTTYPE_IPV6HOST: - { - u_long tmp[4]; -- static char *inet6_ntoa(u_long *addr); /* should be replaced -- by addr2ascii */ - if ((buf = malloc(sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx"))) - == NULL) - fatal_error("get_protoname: no memory\n"); |