| author | Stefan Teleman <stefan.teleman@oracle.com> |
| Mon, 29 Apr 2013 09:50:12 -0700 | |
| branch | s11u1-sru |
| changeset 2588 | 882be62c9698 |
| parent 605 | 8dca74ad1a27 |
| permissions | -rw-r--r-- |
|
2588
882be62c9698
15953796 Upgrade nmap to 6.25
Stefan Teleman <stefan.teleman@oracle.com>
parents:
605
diff
changeset
|
1 |
--- nmap-6.25/libdnet-stripped/src/eth-dlpi.c.orig 2012-12-06 13:42:33.456937114 -0800 |
|
882be62c9698
15953796 Upgrade nmap to 6.25
Stefan Teleman <stefan.teleman@oracle.com>
parents:
605
diff
changeset
|
2 |
+++ nmap-6.25/libdnet-stripped/src/eth-dlpi.c 2012-12-06 13:43:16.505962826 -0800 |
|
605
8dca74ad1a27
7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
565
diff
changeset
|
3 |
@@ -134,7 +134,7 @@ |
|
565
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
4 |
{
|
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
5 |
union DL_primitives *dlp; |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
6 |
uint32_t buf[8192]; |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
7 |
- char *p, dev[16]; |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
8 |
+ char *p, dev[64]; |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
9 |
eth_t *e; |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
10 |
int ppa; |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
11 |
|
|
605
8dca74ad1a27
7113185 upgrade nmap to 5.51
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
565
diff
changeset
|
12 |
@@ -159,6 +159,9 @@ |
|
565
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
13 |
ppa = atoi(p); |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
14 |
*p = '\0'; |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
15 |
|
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
16 |
+#if defined(sun) || defined(__sun) || defined(__sun) |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
17 |
+ snprintf(dev, sizeof(dev), "/dev/net/%s", device); |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
18 |
+#endif |
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
19 |
if ((e->fd = open(dev, O_RDWR)) < 0) {
|
|
39e748a05913
6827835 nmap: unable to open interface (b109)
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents:
diff
changeset
|
20 |
snprintf(dev, sizeof(dev), "/dev/%s", device); |
|
2588
882be62c9698
15953796 Upgrade nmap to 6.25
Stefan Teleman <stefan.teleman@oracle.com>
parents:
605
diff
changeset
|
21 |
if ((e->fd = open(dev, O_RDWR)) < 0) {
|