PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-06 20:51:30 +00:00
Code Issues Projects Releases Wiki Activity

removed BSDFIX/BSDUFIX macros

Browse Source
This commit is contained in:
fyodor
2005-07-27 02:34:14 +00:00
parent 8aa16ebc8d
commit f071c68e07
3 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nmap.h
View File

@@ -395,16 +395,6 @@ void *realloc();
#define MAXHOSTNAMELEN 64 #define MAXHOSTNAMELEN 64
#endif #endif
#ifndef BSDFIX
#if FREEBSD || BSDI || NETBSD
#define BSDFIX(x) x
#define BSDUFIX(x) x
#else
#define BSDFIX(x) htons(x)
#define BSDUFIX(x) ntohs(x)
#endif
#endif /* BSDFIX */
#ifndef recvfrom6_t #ifndef recvfrom6_t
# define recvfrom6_t int # define recvfrom6_t int
#endif #endif

10
tcpip.cc
View File

@@ -968,8 +968,11 @@ int send_ip_packet(int sd, struct eth_nfo *eth, u8 *packet, unsigned int packetl
must deal with it here rather than when building the packet, must deal with it here rather than when building the packet,
because they should be in NBO when I'm sending over raw because they should be in NBO when I'm sending over raw
ethernet */ ethernet */
ip->ip_len = BSDFIX(ip->ip_len); #if FREEBSD || BSDI || NETBSD || DEC
ip->ip_off = BSDFIX(ip->ip_off); ip->ip_len = ntohs(ip->ip_len);
ip->ip_off = ntohs(ip->ip_off);
#endif
res = Sendto("send_ip_packet", sd, packet, packetlen, 0, res = Sendto("send_ip_packet", sd, packet, packetlen, 0,
(struct sockaddr *)&sock, (int)sizeof(struct sockaddr_in)); (struct sockaddr *)&sock, (int)sizeof(struct sockaddr_in));
return res; return res;
@@ -2707,7 +2710,8 @@ do {
error("sendto in %s: sendto(%d, packet, %d, 0, %s, %d) => %s", error("sendto in %s: sendto(%d, packet, %d, 0, %s, %d) => %s",
functionname, sd, len, inet_ntoa(sin->sin_addr), tolen, functionname, sd, len, inet_ntoa(sin->sin_addr), tolen,
strerror(err)); strerror(err));
if (retries > 2 || err == EPERM || err == EACCES || err == EADDRNOTAVAIL) if (retries > 2 || err == EPERM || err == EACCES || err == EADDRNOTAVAIL
|| err == EINVAL)
return -1; return -1;
sleeptime = 15 * (1 << (2 * retries)); sleeptime = 15 * (1 << (2 * retries));
error("Sleeping %d seconds then retrying", sleeptime); error("Sleeping %d seconds then retrying", sleeptime);

10
tcpip.h
View File

@@ -248,16 +248,6 @@ typedef enum { devt_ethernet, devt_loopback, devt_p2p, devt_other } devtype;
#define TCPIP_DEBUGGING 0 #define TCPIP_DEBUGGING 0
#endif #endif
#ifndef BSDFIX
#if FREEBSD || BSDI || NETBSD || DEC
#define BSDFIX(x) x
#define BSDUFIX(x) x
#else
#define BSDFIX(x) htons(x)
#define BSDUFIX(x) ntohs(x)
#endif
#endif
/* Explicit Congestion Notification (rfc 2481/3168) */ /* Explicit Congestion Notification (rfc 2481/3168) */
#ifndef TH_ECE #ifndef TH_ECE
#define TH_ECE 0x40 #define TH_ECE 0x40