michael@99: Index: Net-Packet-3.26/Makefile.PL
michael@99: --- Net-Packet-3.26/Makefile.PL.orig	2006-12-16 16:26:26 +0100
michael@99: +++ Net-Packet-3.26/Makefile.PL	2008-01-01 22:05:18 +0100
michael@99: @@ -14,7 +14,6 @@
michael@99:        Net::Libdnet  => 0,
michael@99:        Time::HiRes   => 0,
michael@99:        Net::IPv6Addr => 0,
michael@99: -      Socket6       => 0,
michael@99:        Bit::Vector   => 0,
michael@99:     },
michael@99:     ABSTRACT_FROM => 'lib/Net/Packet.pm',
michael@99: Index: Net-Patricia-1.014/libpatricia/patricia.c
michael@99: --- Net-Patricia-1.014/libpatricia/patricia.c.orig	2005-12-07 21:55:39 +0100
michael@99: +++ Net-Patricia-1.014/libpatricia/patricia.c	2008-01-01 22:05:18 +0100
michael@99: @@ -38,24 +38,24 @@
michael@99:  /* prefix_tochar
michael@99:   * convert prefix information to bytes
michael@99:   */
michael@99: -u_char *
michael@99: +unsigned char *
michael@99:  prefix_tochar (prefix_t * prefix)
michael@99:  {
michael@99:      if (prefix == NULL)
michael@99:  	return (NULL);
michael@99:  
michael@99: -    return ((u_char *) & prefix->add.sin);
michael@99: +    return ((unsigned char *) & prefix->add.sin);
michael@99:  }
michael@99:  
michael@99:  int 
michael@99: -comp_with_mask (void *addr, void *dest, u_int mask)
michael@99: +comp_with_mask (void *addr, void *dest, unsigned int mask)
michael@99:  {
michael@99:  
michael@99:      if ( /* mask/8 == 0 || */ memcmp (addr, dest, mask / 8) == 0) {
michael@99:  	int n = mask / 8;
michael@99:  	int m = ((-1) << (8 - (mask % 8)));
michael@99:  
michael@99: -	if (mask % 8 == 0 || (((u_char *)addr)[n] & m) == (((u_char *)dest)[n] & m))
michael@99: +	if (mask % 8 == 0 || (((unsigned char *)addr)[n] & m) == (((unsigned char *)dest)[n] & m))
michael@99:  	    return (1);
michael@99:      }
michael@99:      return (0);
michael@99: @@ -70,7 +70,7 @@
michael@99:  int
michael@99:  inet_pton (int af, const char *src, void *dst)
michael@99:  {
michael@99: -    u_long result;  
michael@99: +    unsigned long result;  
michael@99:  
michael@99:      if (af == AF_INET) {
michael@99:  	result = inet_addr(src);
michael@99: @@ -104,7 +104,7 @@
michael@99:  {
michael@99:      if (af == AF_INET) {
michael@99:          int i, c, val;
michael@99: -        u_char xp[4] = {0, 0, 0, 0};
michael@99: +        unsigned char xp[4] = {0, 0, 0, 0};
michael@99:  
michael@99:          for (i = 0; ; i++) {
michael@99:  	    c = *src++;
michael@99: @@ -153,7 +153,7 @@
michael@99:  
michael@99:          struct buffer {
michael@99:              char buffs[16][48+5];
michael@99: -            u_int i;
michael@99: +            unsigned int i;
michael@99:          } *buffp;
michael@99:  
michael@99:  #    if 0
michael@99: @@ -172,7 +172,7 @@
michael@99:  	buff = buffp->buffs[buffp->i++%16];
michael@99:      }
michael@99:      if (prefix->family == AF_INET) {
michael@99: -	u_char *a;
michael@99: +	unsigned char *a;
michael@99:  	assert (prefix->bitlen <= 32);
michael@99:  	a = prefix_touchar (prefix);
michael@99:  	if (with_len) {
michael@99: @@ -272,7 +272,7 @@
michael@99:  prefix_t *
michael@99:  ascii2prefix (int family, char *string)
michael@99:  {
michael@99: -    u_long bitlen, maxbitlen = 0;
michael@99: +    unsigned long bitlen, maxbitlen = 0;
michael@99:      char *cp;
michael@99:      struct in_addr sin;
michael@99:  #ifdef HAVE_IPV6
michael@99: @@ -491,8 +491,8 @@
michael@99:  patricia_search_exact (patricia_tree_t *patricia, prefix_t *prefix)
michael@99:  {
michael@99:      patricia_node_t *node;
michael@99: -    u_char *addr;
michael@99: -    u_int bitlen;
michael@99: +    unsigned char *addr;
michael@99: +    unsigned int bitlen;
michael@99:  
michael@99:      assert (patricia);
michael@99:      assert (prefix);
michael@99: @@ -563,8 +563,8 @@
michael@99:  {
michael@99:      patricia_node_t *node;
michael@99:      patricia_node_t *stack[PATRICIA_MAXBITS + 1];
michael@99: -    u_char *addr;
michael@99: -    u_int bitlen;
michael@99: +    unsigned char *addr;
michael@99: +    unsigned int bitlen;
michael@99:      int cnt = 0;
michael@99:  
michael@99:      assert (patricia);
michael@99: @@ -662,8 +662,8 @@
michael@99:  patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
michael@99:  {
michael@99:      patricia_node_t *node, *new_node, *parent, *glue;
michael@99: -    u_char *addr, *test_addr;
michael@99: -    u_int bitlen, check_bit, differ_bit;
michael@99: +    unsigned char *addr, *test_addr;
michael@99: +    unsigned int bitlen, check_bit, differ_bit;
michael@99:      int i, j, r;
michael@99:  
michael@99:      assert (patricia);
michael@99: Index: Net-Patricia-1.014/libpatricia/patricia.h
michael@99: --- Net-Patricia-1.014/libpatricia/patricia.h.orig	2005-12-07 21:54:52 +0100
michael@99: +++ Net-Patricia-1.014/libpatricia/patricia.h	2008-01-01 22:05:18 +0100
michael@99: @@ -15,10 +15,10 @@
michael@99:  #ifndef _PATRICIA_H
michael@99:  #define _PATRICIA_H
michael@99:  
michael@99: -/* typedef unsigned int u_int; */
michael@99: +/* typedef unsigned int unsigned int; */
michael@99:  typedef void (*void_fn_t)();
michael@99:  /* { from defs.h */
michael@99: -#define prefix_touchar(prefix) ((u_char *)&(prefix)->add.sin)
michael@99: +#define prefix_touchar(prefix) ((unsigned char *)&(prefix)->add.sin)
michael@99:  #define MAXLINE 1024
michael@99:  #define BIT_TEST(f, b)  ((f) & (b))
michael@99:  /* } */
michael@99: @@ -40,15 +40,15 @@
michael@99:  /* { from mrt.h */
michael@99:  
michael@99:  typedef struct _prefix4_t {
michael@99: -    u_short family;		/* AF_INET | AF_INET6 */
michael@99: -    u_short bitlen;		/* same as mask? */
michael@99: +    unsigned short family;		/* AF_INET | AF_INET6 */
michael@99: +    unsigned short bitlen;		/* same as mask? */
michael@99:      int ref_count;		/* reference count */
michael@99:      struct in_addr sin;
michael@99:  } prefix4_t;
michael@99:  
michael@99:  typedef struct _prefix_t {
michael@99: -    u_short family;		/* AF_INET | AF_INET6 */
michael@99: -    u_short bitlen;		/* same as mask? */
michael@99: +    unsigned short family;		/* AF_INET | AF_INET6 */
michael@99: +    unsigned short bitlen;		/* same as mask? */
michael@99:      int ref_count;		/* reference count */
michael@99:      union {
michael@99:  		struct in_addr sin;
michael@99: @@ -61,7 +61,7 @@
michael@99:  /* } */
michael@99:  
michael@99:  typedef struct _patricia_node_t {
michael@99: -   u_int bit;			/* flag if this node used */
michael@99: +   unsigned int bit;			/* flag if this node used */
michael@99:     prefix_t *prefix;		/* who we are in patricia tree */
michael@99:     struct _patricia_node_t *l, *r;	/* left and right children */
michael@99:     struct _patricia_node_t *parent;/* may be used */
michael@99: @@ -71,7 +71,7 @@
michael@99:  
michael@99:  typedef struct _patricia_tree_t {
michael@99:     patricia_node_t 	*head;
michael@99: -   u_int		maxbits;	/* for IP, 32 bit addresses */
michael@99: +   unsigned int		maxbits;	/* for IP, 32 bit addresses */
michael@99:     int num_active_node;		/* for debug purpose */
michael@99:  } patricia_tree_t;
michael@99:  
michael@99: Index: Net-Pcap-0.16/Makefile.PL
michael@99: --- Net-Pcap-0.16/Makefile.PL.orig	2007-12-24 00:06:15 +0100
michael@99: +++ Net-Pcap-0.16/Makefile.PL	2008-01-01 22:08:20 +0100
michael@99: @@ -23,7 +23,8 @@
michael@99:  }
michael@99:  else {
michael@99:      $options{CCFLAGS} = '-Wall -Wwrite-strings' if $Config{ccname} eq 'gcc' and $] >= 5.006;
michael@99: -    $options{LIBS}    = '-lpcap';
michael@99: +    $options{INC}     = '-I@l_prefix@/include';
michael@99: +    $options{LIBS}    = '-L@l_prefix@/lib -lpcap';
michael@99:  }
michael@99:  
michael@99:  for my $arg (@ARGV) {
michael@99: Index: Net-Pcap-0.16/Pcap.xs
michael@99: --- Net-Pcap-0.16/Pcap.xs.orig	2008-01-01 05:22:22 +0100
michael@99: +++ Net-Pcap-0.16/Pcap.xs	2008-01-01 22:05:18 +0100
michael@99: @@ -33,7 +33,7 @@
michael@99:  #define NEED_sv_2pv_nolen 1
michael@99:  #include "ppport.h"
michael@99:  
michael@99: -#include <pcap.h>
michael@99: +#include "pcap.h"
michael@99:  
michael@99:  #ifdef _CYGWIN
michael@99:  #include <Win32-Extensions.h>