PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-25 23:59:01 +00:00
Code Issues Projects Releases Wiki Activity

Back out r6322, which added a debugging message to libdnet. The bug which

Browse Source 
necessitated the message will be fixed in a pending commit.
This commit is contained in:
david
2007-12-03 23:44:02 +00:00
parent 8a9fdeeb24
commit 62823cb379
2 changed files with 1 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libdnet-stripped/NMAP_MODIFICATIONS
View File

@@ -390,37 +390,3 @@ Index: src/intf-win32.c
for (i = 0; i < intf->ifcombo[ifrow->dwType].cnt; i++) {
if (intf->ifcombo[ifrow->dwType].idx[i] == ifrow->dwIndex)
o Show a warning whenever a Windows interface type is unrecognized.
Index: src/intf-win32.c
===================================================================
--- src/intf-win32.c (revision 6321)
+++ src/intf-win32.c (working copy)
@@ -23,6 +23,8 @@
#include <stdlib.h>
#include <string.h>
+#include "err.h"
+
#include "pcap.h"
struct ifcombo {
@@ -42,7 +44,7 @@
static char *
_ifcombo_name(int type)
{
- char *name = "net"; /* XXX */
+ char *name;
if (type == MIB_IF_TYPE_ETHERNET) {
name = "eth";
@@ -56,6 +58,9 @@
name = "lo";
} else if (type == MIB_IF_TYPE_SLIP) {
name = "sl";
+ } else {
+ name = "net";
+ warnx("_ifcombo_name: Mapping unknown interface type %d to \"%s\".\n", type, name);
}
return (name);
}

7
libdnet-stripped/src/intf-win32.c
View File

@@ -23,8 +23,6 @@
#include <stdlib.h>
#include <string.h>
#include "err.h"
#include "pcap.h"
struct ifcombo {
@@ -44,7 +42,7 @@ struct intf_handle {
static char *
_ifcombo_name(int type)
{
char *name;
char *name = "net"; /* XXX */
if (type == MIB_IF_TYPE_ETHERNET) {
name = "eth";
@@ -58,9 +56,6 @@ _ifcombo_name(int type)
name = "lo";
} else if (type == MIB_IF_TYPE_SLIP) {
name = "sl";
} else {
name = "net";
warnx("_ifcombo_name: Mapping unknown interface type %d to \"%s\".\n", type, name);
}
return (name);
}