From 111fbe4b414129327b02f62bdfe842ac986502a9 Mon Sep 17 00:00:00 2001 From: dmiller Date: Wed, 5 Nov 2014 15:02:09 +0000 Subject: [PATCH] Modify some offensive terminology in comments. --- libnetutil/ARPHeader.h | 2 +- nmap_ftp.cc | 2 +- nping/ProbeMode.cc | 2 +- osscan2.cc | 4 ++-- service_scan.cc | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libnetutil/ARPHeader.h b/libnetutil/ARPHeader.h index c829d6723..093992c52 100644 --- a/libnetutil/ARPHeader.h +++ b/libnetutil/ARPHeader.h @@ -217,7 +217,7 @@ class ARPHeader : public NetworkLayerElement { u8 ar_pln; /* Protocol Address Length. */ u16 ar_op; /* Operation Code. */ u8 data[20]; - // Cannot use these because the fucking alignment screws up + // Cannot use these because the four-flushing alignment screws up // everything. I miss ANSI C. //u8 ar_sha[6]; /* Sender Hardware Address. */ //u32 ar_sip; /* Sender Protocol Address (IPv4 address). */ diff --git a/nmap_ftp.cc b/nmap_ftp.cc index 61770751a..a497cf1e6 100644 --- a/nmap_ftp.cc +++ b/nmap_ftp.cc @@ -341,7 +341,7 @@ void bounce_scan(Target *target, u16 *portarray, int numports, if (o.debugging) log_write(LOG_STDOUT, "result of LIST: %s", recvbuf); if (!strncmp(recvbuf, "500", 3)) { - /* fuck, we are not aligned properly */ + /* oh dear, we are not aligned properly */ if (o.verbose || o.debugging) error("FTP command misalignment detected ... correcting."); res = recvtime(sd, recvbuf, 2048, 10, NULL); diff --git a/nping/ProbeMode.cc b/nping/ProbeMode.cc index c16520bf0..430519697 100644 --- a/nping/ProbeMode.cc +++ b/nping/ProbeMode.cc @@ -759,7 +759,7 @@ int ProbeMode::doIPv6ThroughSocket(int rawfd){ /* Transport layer checksum */ /* This is totally crazy. We have to tell the kernel EXPLICITLY that we * want it to set the TCP/UDP checksum for us. Why the hell is this the - * default behavior if it's so fucking difficult to get the IPv6 source + * default behavior if it's so incredibly difficult to get the IPv6 source * address? * Additionally, we have to be very careful not to set this option when * dealing with ICMPv6 because in that case the kernel computes the diff --git a/osscan2.cc b/osscan2.cc index d57e6318f..322004abe 100644 --- a/osscan2.cc +++ b/osscan2.cc @@ -3169,7 +3169,7 @@ bool HostOsScan::processTUdpResp(HostOsScanStats *hss, struct ip *ip) { if (in_cksum((unsigned short *)ip2, 20) == checksum) { AV.value = "G"; /* The "expected" good value */ } else { - AV.value = "I"; /* They fucked it up */ + AV.value = "I"; /* They modified it */ } *checksumptr = checksum; } @@ -3194,7 +3194,7 @@ bool HostOsScan::processTUdpResp(HostOsScanStats *hss, struct ip *ip) { } AV.attribute = "RUD"; if (datastart < dataend) - AV.value = "I"; /* They fucked it up */ + AV.value = "I"; /* They modified it */ else AV.value = "G"; AVs.push_back(AV); diff --git a/service_scan.cc b/service_scan.cc index 6d7d538a7..049bc4813 100644 --- a/service_scan.cc +++ b/service_scan.cc @@ -821,6 +821,7 @@ static char *substvar(char *tmplvar, char **tmplvarend, // matches in ovector. The NUL-terminated newly composted string is // placed into 'newstr', as long as it doesn't exceed 'newstrlen' // bytes. Trailing whitespace and commas are removed. Returns zero for success +// FIXME: The newstrlen argument is not actually checked, is it? // // The transform argument is a function pointer. If not NULL, the given // function is applied to all substitutions before they are inserted @@ -836,7 +837,7 @@ static int dotmplsubst(const u8 *subject, int subjectlen, char *subst; if (!newstr || !tmpl) return -1; - if (newstrlen < 3) return -1; // fuck this! + if (newstrlen < 3) return -1; // Have a nice day! while(*srcstart) { // First do any literal text before '$'