1 --- nmap-5.51/libdnet-stripped/include/dnet/fw.h.orig	Fri May  4 09:39:17 2012

     2 +++ nmap-5.51/libdnet-stripped/include/dnet/fw.h	Fri May  4 09:39:30 2012

     3 @@ -39,16 +39,16 @@

     4  	(rule)->fw_dport[0] = dp1; (rule)->fw_dport[1] = dp2;		\

     5  } while (0)

     6  

     7 -typedef struct fw_handle fw_t;

     8 +typedef struct fw_handle dnet_fw_t;

     9  

    10  typedef int (*fw_handler)(const struct fw_rule *rule, void *arg);

    11  

    12  __BEGIN_DECLS

    13 -fw_t	*fw_open(void);

    14 -int	 fw_add(fw_t *f, const struct fw_rule *rule);

    15 -int	 fw_delete(fw_t *f, const struct fw_rule *rule);

    16 -int	 fw_loop(fw_t *f, fw_handler callback, void *arg);

    17 -fw_t	*fw_close(fw_t *f);

    18 +dnet_fw_t	*fw_open(void);

    19 +int	 fw_add(dnet_fw_t *f, const struct fw_rule *rule);

    20 +int	 fw_delete(dnet_fw_t *f, const struct fw_rule *rule);

    21 +int	 fw_loop(dnet_fw_t *f, fw_handler callback, void *arg);

    22 +dnet_fw_t	*fw_close(dnet_fw_t *f);

    23  __END_DECLS

    24  

    25  #endif /* DNET_FW_H */

    26 --- nmap-5.51/libdnet-stripped/src/fw-none.c.orig	Fri May  4 09:43:16 2012

    27 +++ nmap-5.51/libdnet-stripped/src/fw-none.c	Fri May  4 09:43:28 2012

    28 @@ -14,7 +14,7 @@

    29  

    30  #include "dnet.h"

    31  

    32 -fw_t *

    33 +dnet_fw_t *

    34  fw_open(void)

    35  {

    36  	errno = ENOSYS;

    37 @@ -22,7 +22,7 @@

    38  }

    39  

    40  int

    41 -fw_add(fw_t *f, const struct fw_rule *rule)

    42 +fw_add(dnet_fw_t *f, const struct fw_rule *rule)

    43  {

    44  	errno = ENOSYS;

    45  	return (-1);

    46 @@ -29,7 +29,7 @@

    47  }

    48  

    49  int

    50 -fw_delete(fw_t *f, const struct fw_rule *rule)

    51 +fw_delete(dnet_fw_t *f, const struct fw_rule *rule)

    52  {

    53  	errno = ENOSYS;

    54  	return (-1);

    55 @@ -36,14 +36,14 @@

    56  }

    57  

    58  int

    59 -fw_loop(fw_t *f, fw_handler callback, void *arg)

    60 +fw_loop(dnet_fw_t *f, fw_handler callback, void *arg)

    61  {

    62  	errno = ENOSYS;

    63  	return (-1);

    64  }

    65  

    66 -fw_t *

    67 -fw_close(fw_t *f)

    68 +dnet_fw_t *

    69 +fw_close(dnet_fw_t *f)

    70  {

    71  	return (NULL);

    72  }