CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-08-04 14:49:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix raw packet sending on FreeBSD 10.0 and later.

Browse source 
See https://svnweb.freebsd.org/base?view=revision&revision=241913 for
the change. Closes #196. Fixes #50.
This commit is contained in:
dmiller 2015-08-06 21:10:36 +00:00
parent 9fbad88213
commit 9ab82ecedf
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG
View file

@ -1,5 +1,9 @@
# Nmap Changelog ($Id$); -*-text-*-
o [GH#196] Fix raw packet sending on FreeBSD 10.0 and later. FreeBSD changed
byte order of the IPv4 stack, so SYN scan and other raw packet functions were
broken. [Edward Napierała] Also reported in [GH#50] by Olli Hauer.
o [NSE] Added script http-svn-enum. Enumerates users of a Subversion
repostory by examinning commit logs. [Gyanendra Mishra]

4
libnetutil/netutil.cc
View file

@ -3604,7 +3604,7 @@ int send_ip_packet_sd(int sd, const struct sockaddr_in *dst,
must deal with it here rather than when building the packet,
because they should be in NBO when I'm sending over raw
ethernet */
#if FREEBSD || BSDI || NETBSD || DEC || MACOSX
#if (defined(FREEBSD) && (__FreeBSD_version < 1000022)) || BSDI || NETBSD || DEC || MACOSX
ip->ip_len = ntohs(ip->ip_len);
ip->ip_off = ntohs(ip->ip_off);
#endif
@ -3614,7 +3614,7 @@ int send_ip_packet_sd(int sd, const struct sockaddr_in *dst,
(int) sizeof(struct sockaddr_in));
/* Undo the byte order switching. */
#if FREEBSD || BSDI || NETBSD || DEC || MACOSX
#if (defined(FREEBSD) && (__FreeBSD_version < 1000022)) || BSDI || NETBSD || DEC || MACOSX
ip->ip_len = htons(ip->ip_len);
ip->ip_off = htons(ip->ip_off);
#endif