Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/nmap/patches/libdnet-stripped.src.vmtypes.patch
author Rich Burridge <rich.burridge@oracle.com>
Thu, 20 Dec 2012 09:40:43 -0800
changeset 1091 ce8b381f34b6
parent 826 c6aad84d2493
permissions -rw-r--r--
PSARC 2012/376 nmap 6.25 15953796 Upgrade nmap to 6.25
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1091
ce8b381f34b6 PSARC 2012/376 nmap 6.25
Rich Burridge <rich.burridge@oracle.com>
parents: 826
diff changeset 
     1
 
--- nmap-6.25/libdnet-stripped/include/dnet/fw.h.orig	2012-12-06 13:46:17.245644790 -0800
ce8b381f34b6 PSARC 2012/376 nmap 6.25
Rich Burridge <rich.burridge@oracle.com>
parents: 826
diff changeset 
     2
 
+++ nmap-6.25/libdnet-stripped/include/dnet/fw.h	2012-12-06 13:48:24.783484617 -0800
826
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -39,16 +39,16 @@
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     4
 
 	(rule)->fw_dport[0] = dp1; (rule)->fw_dport[1] = dp2;		\
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     5
 
 } while (0)
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     6
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     7
 
-typedef struct fw_handle fw_t;
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     8
 
+typedef struct fw_handle dnet_fw_t;
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
     9
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    10
 
 typedef int (*fw_handler)(const struct fw_rule *rule, void *arg);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    11
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    12
 
 __BEGIN_DECLS
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    13
 
-fw_t	*fw_open(void);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    14
 
-int	 fw_add(fw_t *f, const struct fw_rule *rule);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    15
 
-int	 fw_delete(fw_t *f, const struct fw_rule *rule);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    16
 
-int	 fw_loop(fw_t *f, fw_handler callback, void *arg);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    17
 
-fw_t	*fw_close(fw_t *f);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    18
 
+dnet_fw_t	*fw_open(void);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    19
 
+int	 fw_add(dnet_fw_t *f, const struct fw_rule *rule);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    20
 
+int	 fw_delete(dnet_fw_t *f, const struct fw_rule *rule);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    21
 
+int	 fw_loop(dnet_fw_t *f, fw_handler callback, void *arg);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    22
 
+dnet_fw_t	*fw_close(dnet_fw_t *f);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    23
 
 __END_DECLS
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    24
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    25
 
 #endif /* DNET_FW_H */
1091
ce8b381f34b6 PSARC 2012/376 nmap 6.25
Rich Burridge <rich.burridge@oracle.com>
parents: 826
diff changeset 
    26
 
--- nmap-6.25/libdnet-stripped/src/fw-none.c.orig	2012-12-06 13:58:57.466770363 -0800
ce8b381f34b6 PSARC 2012/376 nmap 6.25
Rich Burridge <rich.burridge@oracle.com>
parents: 826
diff changeset 
    27
 
+++ nmap-6.25/libdnet-stripped/src/fw-none.c	2012-12-06 13:48:40.567679655 -0800
826
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    28
 
@@ -14,7 +14,7 @@
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    29
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    30
 
 #include "dnet.h"
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    31
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    32
 
-fw_t *
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    33
 
+dnet_fw_t *
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    34
 
 fw_open(void)
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    35
 
 {
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    36
 
 	errno = ENOSYS;
1091
ce8b381f34b6 PSARC 2012/376 nmap 6.25
Rich Burridge <rich.burridge@oracle.com>
parents: 826
diff changeset 
    37
 
@@ -22,28 +22,28 @@
826
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    38
 
 }
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    39
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    40
 
 int
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    41
 
-fw_add(fw_t *f, const struct fw_rule *rule)
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    42
 
+fw_add(dnet_fw_t *f, const struct fw_rule *rule)
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    43
 
 {
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    44
 
 	errno = ENOSYS;
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    45
 
 	return (-1);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    46
 
 }
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    47
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    48
 
 int
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    49
 
-fw_delete(fw_t *f, const struct fw_rule *rule)
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    50
 
+fw_delete(dnet_fw_t *f, const struct fw_rule *rule)
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    51
 
 {
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    52
 
 	errno = ENOSYS;
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    53
 
 	return (-1);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    54
 
 }
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    55
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    56
 
 int
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    57
 
-fw_loop(fw_t *f, fw_handler callback, void *arg)
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    58
 
+fw_loop(dnet_fw_t *f, fw_handler callback, void *arg)
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    59
 
 {
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    60
 
 	errno = ENOSYS;
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    61
 
 	return (-1);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    62
 
 }
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    63
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    64
 
-fw_t *
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    65
 
-fw_close(fw_t *f)
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    66
 
+dnet_fw_t *
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    67
 
+fw_close(dnet_fw_t *f)
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    68
 
 {
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    69
 
 	return (NULL);
c6aad84d2493 7166560 nmap fails to build on 15
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff changeset 
    70
 
 }
upstream/oracle/userland-gate