Skip to content

Commit 6ee953a

Browse files
author
rewanth
committed
Removes trailing spaces in 69 files. Closes nmap#971.
1 parent 1c8e232 commit 6ee953a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+410
-410
lines changed

CHANGELOG

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ o [NSE][GH#892] New script http-bigip-cookie decodes unencrypted F5 BIG-IP
1111
cookies and reports back the IP address and port of the actual server behind
1212
the load-balancer. [Seth Jackson]
1313

14-
o [NSE] New script http-jsonp-detection Attempts to discover JSONP endpoints in
15-
web servers. JSONP endpoints can be used to bypass Same-origin Policy
14+
o [NSE] New script http-jsonp-detection Attempts to discover JSONP endpoints in
15+
web servers. JSONP endpoints can be used to bypass Same-origin Policy
1616
restrictions in web browsers. [Vinamra Bhatia]
1717

1818
o Nmap can now resolve and scan all IP addresses of a host. Instead of using

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Table of Contents
22
---
3-
3+
44
* [Introduction](#intro)
55
* [Code Repository](#repo)
66
* [Bug Reports](#bug)

Makefile.in

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export LIBLINEAR_LIBS = @LIBLINEAR_LIBS@
2626
export NCATDIR=@NCATDIR@
2727
CC = @CC@
2828
CXX = @CXX@
29-
CCOPT =
30-
DBGFLAGS =
29+
CCOPT =
30+
DBGFLAGS =
3131
STRIP = @STRIP@
3232
LIBPCAPDIR = @libpcapdir@
3333
LIBSSH2DIR = @LIBSSH2DIR@
@@ -74,7 +74,7 @@ LINGUAS ?= $(ALL_LINGUAS)
7474

7575

7676
# DESTDIR is used by some package maintainers to install Nmap under
77-
# its usual directory structure into a different tree. See the
77+
# its usual directory structure into a different tree. See the
7878
# CHANGELOG for more info.
7979
DESTDIR =
8080

@@ -469,7 +469,7 @@ check-dns: tests/check_dns
469469

470470
check: @NCAT_CHECK@ @NSOCK_CHECK@ @ZENMAP_CHECK@ @NSE_CHECK@ @NDIFF_CHECK@ check-dns
471471

472-
${srcdir}/configure: configure.ac
472+
${srcdir}/configure: configure.ac
473473
cd ${srcdir} && autoconf
474474

475475
## autoheader might not change config.h.in, so touch a stamp file.

acinclude.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extern char pcap_version[];
4040
int main() {
4141
int major, minor1, minor2;
4242
sscanf(pcap_version,"%d.%d.%d", &major, &minor1, &minor2);
43-
if (major > 0)
43+
if (major > 0)
4444
return 0;
4545
if (minor1 < 9)
4646
return 1;
@@ -227,7 +227,7 @@ AC_DEFUN([APR_FIND_APR], [
227227
228228
AC_MSG_CHECKING(for APR)
229229
AC_ARG_WITH(apr,
230-
[ --with-apr=PATH prefix for installed APR or the full path to
230+
[ --with-apr=PATH prefix for installed APR or the full path to
231231
apr-config],
232232
[
233233
if test "$withval" = "no" || test "$withval" = "yes"; then

libnetutil/ARPHeader.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,15 +209,15 @@
209209
#define OP_RESERVED 65535 /* Reserved [RFC5494] */
210210

211211

212-
/* TODO @todo: getTargetIP() and getSenderIP() should either
212+
/* TODO @todo: getTargetIP() and getSenderIP() should either
213213
* return struct in_addr or IPAddress but not u32. */
214214

215215
class ARPHeader : public NetworkLayerElement {
216216

217217
private:
218218

219219
struct nping_arp_hdr{
220-
220+
221221
u16 ar_hrd; /* Hardware Type. */
222222
u16 ar_pro; /* Protocol Type. */
223223
u8 ar_hln; /* Hardware Address Length. */

libnetutil/DestOptsHeader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class DestOptsHeader : public HopByHopHeader {
145145
. .
146146
| |
147147
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */
148-
// Implemented in HopByHopHeader.h
148+
// Implemented in HopByHopHeader.h
149149
public:
150150
DestOptsHeader();
151151
~DestOptsHeader();

libnetutil/EthernetHeader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class EthernetHeader : public DataLinkLayerElement {
180180
nping_eth_hdr_t h;
181181

182182
public:
183-
183+
184184
EthernetHeader();
185185
~EthernetHeader();
186186
void reset();

libnetutil/FragmentHeader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class FragmentHeader : public IPv6ExtensionHeader {
154154
typedef struct nping_ipv6_ext_fragment_hdr nping_ipv6_ext_fragment_hdr_t;
155155

156156
nping_ipv6_ext_fragment_hdr_t h;
157-
157+
158158
public:
159159
FragmentHeader();
160160
~FragmentHeader();

libnetutil/HopByHopHeader.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class HopByHopHeader : public IPv6ExtensionHeader {
170170

171171
nping_ipv6_ext_hopbyhop_hdr_t h;
172172
u8 *curr_option;
173-
173+
174174
public:
175175
HopByHopHeader();
176176
~HopByHopHeader();

libnetutil/ICMPv4Header.cc

+8-8
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ bool ICMPv4Header::validateType(u8 val){
380380
} /* End of validateType() */
381381

382382

383-
/** Returns true if the type fields contains an RFC compliant ICMP message
383+
/** Returns true if the type fields contains an RFC compliant ICMP message
384384
* type. */
385385
bool ICMPv4Header::validateType(){
386386
return validateType( this->h.type );
@@ -500,13 +500,13 @@ int ICMPv4Header::setSum(){
500500
u8 buffer[65535];
501501
int total_len=0;
502502
h.checksum = 0;
503-
503+
504504
memcpy(buffer, &h, length);
505-
505+
506506
if( this->getNextElement() != NULL)
507-
total_len=next->dumpToBinaryBuffer(buffer+length, 65535-length);
507+
total_len=next->dumpToBinaryBuffer(buffer+length, 65535-length);
508508
total_len+=length;
509-
509+
510510
h.checksum = in_cksum((unsigned short *)buffer, total_len);
511511

512512
return OP_SUCCESS;
@@ -636,7 +636,7 @@ u32 ICMPv4Header::getReserved() const {
636636
* host byte order */
637637
return (u32)ntohs(h_trc->unused);
638638
break;
639-
639+
640640
default:
641641
return OP_FAILURE;
642642
break;
@@ -1100,7 +1100,7 @@ int ICMPv4Header::getICMPHeaderLengthFromType( u8 type ) const {
11001100
case ICMP_TRACEROUTE:
11011101
return 20;
11021102
break;
1103-
1103+
11041104
case ICMP_DOMAINNAME:
11051105
case ICMP_DOMAINNAMEREPLY:
11061106
return 8;
@@ -1214,7 +1214,7 @@ const char *ICMPv4Header::type2string(int type, int code) const {
12141214
case ICMP_MASKREPLY:
12151215
return "Address mask reply";
12161216
break;
1217-
1217+
12181218
case ICMP_TRACEROUTE:
12191219
return "Traceroute";
12201220
break;

libnetutil/ICMPv4Header.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ class ICMPv4Header : public ICMPHeader {
217217
/**********************************************************************/
218218
/* ICMPv4 MESSAGE SPECIFIC HEADERS */
219219
/**********************************************************************/
220-
220+
221221
/* Destination Unreachable Message
222222
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
223223
| Type | Code | Checksum |
@@ -232,7 +232,7 @@ class ICMPv4Header : public ICMPHeader {
232232
}__attribute__((__packed__));
233233
typedef struct icmp4_dest_unreach_msg icmp4_dest_unreach_msg_t;
234234

235-
235+
236236
/* Time Exceeded Message
237237
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
238238
| Type | Code | Checksum |
@@ -247,7 +247,7 @@ class ICMPv4Header : public ICMPHeader {
247247
}__attribute__((__packed__));
248248
typedef struct icmp4_time_exceeded_msg icmp4_time_exceeded_msg_t;
249249

250-
250+
251251
/* Parameter Problem Message
252252
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
253253
| Type | Code | Checksum |
@@ -264,7 +264,7 @@ class ICMPv4Header : public ICMPHeader {
264264
}__attribute__((__packed__));
265265
typedef struct icmp4_parameter_problem_msg icmp4_parameter_problem_msg_t;
266266

267-
267+
268268
/* Source Quench Message
269269
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
270270
| Type | Code | Checksum |
@@ -279,7 +279,7 @@ class ICMPv4Header : public ICMPHeader {
279279
}__attribute__((__packed__));
280280
typedef struct icmp4_source_quench_msg icmp4_source_quench_msg_t;
281281

282-
282+
283283
/* Redirect Message
284284
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
285285
| Type | Code | Checksum |
@@ -294,7 +294,7 @@ class ICMPv4Header : public ICMPHeader {
294294
}__attribute__((__packed__));
295295
typedef struct icmp4_redirect_msg icmp4_redirect_msg_t;
296296

297-
297+
298298
/* Echo Request/Reply Message
299299
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
300300
| Type | Code | Checksum |
@@ -345,7 +345,7 @@ class ICMPv4Header : public ICMPHeader {
345345
}__attribute__((__packed__));
346346
typedef struct icmp4_information_msg icmp4_information_msg_t;
347347

348-
348+
349349
/* ICMP Router Advertisement Message
350350
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
351351
| Type | Code | Checksum |
@@ -458,7 +458,7 @@ class ICMPv4Header : public ICMPHeader {
458458
u16 sequence;
459459
}__attribute__((__packed__));
460460
typedef struct icmp4_domain_name_request_msg icmp4_domain_name_request_msg_t;
461-
461+
462462

463463
/* ICMP Domain Name Reply Message
464464
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -594,7 +594,7 @@ class ICMPv4Header : public ICMPHeader {
594594
int getICMPHeaderLengthFromType( u8 type ) const;
595595
const char *type2string(int type, int code) const;
596596
bool isError() const;
597-
597+
598598

599599
}; /* End of class ICMPv4Header */
600600

0 commit comments

Comments
 (0)