1 --- nmap-5.51/libdnet-stripped/include/dnet/fw.h.orig Fri May 4 09:39:17 2012 |
1 --- nmap-6.25/libdnet-stripped/include/dnet/fw.h.orig 2012-12-06 13:46:17.245644790 -0800 |
2 +++ nmap-5.51/libdnet-stripped/include/dnet/fw.h Fri May 4 09:39:30 2012 |
2 +++ nmap-6.25/libdnet-stripped/include/dnet/fw.h 2012-12-06 13:48:24.783484617 -0800 |
3 @@ -39,16 +39,16 @@ |
3 @@ -39,16 +39,16 @@ |
4 (rule)->fw_dport[0] = dp1; (rule)->fw_dport[1] = dp2; \ |
4 (rule)->fw_dport[0] = dp1; (rule)->fw_dport[1] = dp2; \ |
5 } while (0) |
5 } while (0) |
6 |
6 |
7 -typedef struct fw_handle fw_t; |
7 -typedef struct fw_handle fw_t; |
21 +int fw_loop(dnet_fw_t *f, fw_handler callback, void *arg); |
21 +int fw_loop(dnet_fw_t *f, fw_handler callback, void *arg); |
22 +dnet_fw_t *fw_close(dnet_fw_t *f); |
22 +dnet_fw_t *fw_close(dnet_fw_t *f); |
23 __END_DECLS |
23 __END_DECLS |
24 |
24 |
25 #endif /* DNET_FW_H */ |
25 #endif /* DNET_FW_H */ |
26 --- nmap-5.51/libdnet-stripped/src/fw-none.c.orig Fri May 4 09:43:16 2012 |
26 --- nmap-6.25/libdnet-stripped/src/fw-none.c.orig 2012-12-06 13:58:57.466770363 -0800 |
27 +++ nmap-5.51/libdnet-stripped/src/fw-none.c Fri May 4 09:43:28 2012 |
27 +++ nmap-6.25/libdnet-stripped/src/fw-none.c 2012-12-06 13:48:40.567679655 -0800 |
28 @@ -14,7 +14,7 @@ |
28 @@ -14,7 +14,7 @@ |
29 |
29 |
30 #include "dnet.h" |
30 #include "dnet.h" |
31 |
31 |
32 -fw_t * |
32 -fw_t * |
33 +dnet_fw_t * |
33 +dnet_fw_t * |
34 fw_open(void) |
34 fw_open(void) |
35 { |
35 { |
36 errno = ENOSYS; |
36 errno = ENOSYS; |
37 @@ -22,7 +22,7 @@ |
37 @@ -22,28 +22,28 @@ |
38 } |
38 } |
39 |
39 |
40 int |
40 int |
41 -fw_add(fw_t *f, const struct fw_rule *rule) |
41 -fw_add(fw_t *f, const struct fw_rule *rule) |
42 +fw_add(dnet_fw_t *f, const struct fw_rule *rule) |
42 +fw_add(dnet_fw_t *f, const struct fw_rule *rule) |
43 { |
43 { |
44 errno = ENOSYS; |
44 errno = ENOSYS; |
45 return (-1); |
45 return (-1); |
46 @@ -29,7 +29,7 @@ |
|
47 } |
46 } |
48 |
47 |
49 int |
48 int |
50 -fw_delete(fw_t *f, const struct fw_rule *rule) |
49 -fw_delete(fw_t *f, const struct fw_rule *rule) |
51 +fw_delete(dnet_fw_t *f, const struct fw_rule *rule) |
50 +fw_delete(dnet_fw_t *f, const struct fw_rule *rule) |
52 { |
51 { |
53 errno = ENOSYS; |
52 errno = ENOSYS; |
54 return (-1); |
53 return (-1); |
55 @@ -36,14 +36,14 @@ |
|
56 } |
54 } |
57 |
55 |
58 int |
56 int |
59 -fw_loop(fw_t *f, fw_handler callback, void *arg) |
57 -fw_loop(fw_t *f, fw_handler callback, void *arg) |
60 +fw_loop(dnet_fw_t *f, fw_handler callback, void *arg) |
58 +fw_loop(dnet_fw_t *f, fw_handler callback, void *arg) |