Merge pull request #19372 from cotequeiroz/libgd
[feed/packages.git] / net / hping3 / patches / 130_spelling_error_in_binary.patch
1 Subject; Fix spelling error in binary (lintian -IE)
2 Author: Romain Francoise <rfrancoise@debian.org>
3 Last-Update: 2005-03-12
4
5 --- a/parseoptions.c
6 +++ b/parseoptions.c
7 @@ -179,7 +179,7 @@ void parse_route(unsigned char *route, u
8 str[j++] = '/';
9 break;
10 }
11 - fprintf(stderr, "invalid IP adress in route\n");
12 + fprintf(stderr, "invalid IP address in route\n");
13 fail_parse_route();
14 case ':':
15 if ((!i) && j && j < 4)
16 --- a/getifname.c
17 +++ b/getifname.c
18 @@ -206,7 +206,7 @@ int get_if_name(void)
19 printf("DEBUG: Output interface address: %s\n",
20 inet_ntoa(output_if_addr.sin_addr));
21 /* Put something in saved_ifname in order to tell
22 - that the output adress is known */
23 + that the output address is known */
24 saved_ifname[0] = 'X'; saved_ifname[1] = 0;
25 } else {
26 fprintf(stderr, "Warning: Unable to guess the output "
27 --- a/usage.c
28 +++ b/usage.c
29 @@ -50,7 +50,7 @@ void show_usage(void)
30 " -r --rel relativize id field (to estimate host traffic)\n"
31 " -f --frag split packets in more frag. (may pass weak acl)\n"
32 " -x --morefrag set more fragments flag\n"
33 -" -y --dontfrag set dont fragment flag\n"
34 +" -y --dontfrag set don't fragment flag\n"
35 " -g --fragoff set the fragment offset\n"
36 " -m --mtu set virtual mtu, implies --frag if packet size > mtu\n"
37 " -o --tos type of service (default 0x00), try --tos help\n"
38 @@ -131,8 +131,8 @@ void icmp_help(void)
39 "ICMP help:\n"
40 " ICMP concerned packet options:\n"
41 " --icmp-ipver set ip version ( default 4 )\n"
42 -" --icmp-iphlen set ip header lenght ( default IPHDR_SIZE >> 2)\n"
43 -" --icmp-iplen set ip total lengtht ( default real lenght )\n"
44 +" --icmp-iphlen set ip header length ( default IPHDR_SIZE >> 2)\n"
45 +" --icmp-iplen set ip total length ( default real length )\n"
46 " --icmp-ipid set ip id ( default random )\n"
47 " --icmp-ipproto set ip protocol ( default IPPROTO_TCP )\n"
48 " --icmp-ipsrc set ip source ( default 0.0.0.0 )\n"
49 --- a/sendtcp.c
50 +++ b/sendtcp.c
51 @@ -50,7 +50,7 @@ void send_tcp(void)
52 memcpy(&pseudoheader->saddr, &local.sin_addr.s_addr, 4);
53 memcpy(&pseudoheader->daddr, &remote.sin_addr.s_addr, 4);
54 pseudoheader->protocol = 6; /* tcp */
55 - pseudoheader->lenght = htons(TCPHDR_SIZE+tcp_opt_size+data_size);
56 + pseudoheader->length = htons(TCPHDR_SIZE+tcp_opt_size+data_size);
57
58 /* tcp header */
59 tcp->th_dport = htons(dst_port);
60 --- a/sendudp.c
61 +++ b/sendudp.c
62 @@ -46,7 +46,7 @@ void send_udp(void)
63 memcpy(&pseudoheader->saddr, &local.sin_addr.s_addr, 4);
64 memcpy(&pseudoheader->daddr, &remote.sin_addr.s_addr, 4);
65 pseudoheader->protocol = 17; /* udp */
66 - pseudoheader->lenght = htons(packet_size);
67 + pseudoheader->length = htons(packet_size);
68
69 /* udp header */
70 udp->uh_dport = htons(dst_port);
71 --- a/sendicmp.c
72 +++ b/sendicmp.c
73 @@ -243,7 +243,7 @@ void send_icmp_other(void)
74 memcpy(&pseudoheader->saddr, &icmp_ip_src.sin_addr.s_addr, 4);
75 memcpy(&pseudoheader->daddr, &icmp_ip_dst.sin_addr.s_addr, 4);
76 pseudoheader->protocol = icmp_ip.protocol;
77 - pseudoheader->lenght = icmp_ip.tot_len;
78 + pseudoheader->length = icmp_ip.tot_len;
79 icmp_udp->uh_sport = htons(icmp_ip_srcport);
80 icmp_udp->uh_dport = htons(icmp_ip_dstport);
81 icmp_udp->uh_ulen = htons(UDPHDR_SIZE + udp_data_len);
82 --- a/hping2.h
83 +++ b/hping2.h
84 @@ -138,7 +138,7 @@
85
86 /* fragmentation defines */
87 #define MF ((unsigned short)0x2000) /* more fragments */
88 -#define DF ((unsigned short)0x4000) /* dont fragment */
89 +#define DF ((unsigned short)0x4000) /* don't fragment */
90 #define NF ((unsigned short)0x0000) /* no more fragments */
91
92 /* ip options defines */
93 @@ -341,7 +341,7 @@ struct pseudohdr
94 __u32 daddr;
95 __u8 zero;
96 __u8 protocol;
97 - __u16 lenght;
98 + __u16 length;
99 };
100
101 #define PSEUDOHDR_SIZE sizeof(struct pseudohdr)
102 --- a/ars.c
103 +++ b/ars.c
104 @@ -698,7 +698,7 @@ int ars_udptcp_cksum(struct ars_packet *
105 memcpy(&pseudo.daddr, &ip->daddr, 4);
106 pseudo.protocol = (pkt->p_layer[layer].l_type == ARS_TYPE_TCP)
107 ? ARS_IPPROTO_TCP : ARS_IPPROTO_UDP;
108 - pseudo.lenght = htons(ars_relative_size(pkt, layer));
109 + pseudo.length = htons(ars_relative_size(pkt, layer));
110
111 /* Finally do the checksum */
112 ars_multi_cksum(&mc, ARS_MC_INIT, NULL, 0);
113 --- a/datahandler.c
114 +++ b/datahandler.c
115 @@ -26,7 +26,7 @@ void data_handler(char *data, int data_s
116 }
117
118 if (opt_sign) {
119 - memcpy(data, sign, signlen); /* lenght pre-checked */
120 + memcpy(data, sign, signlen); /* length pre-checked */
121 data+=signlen;
122 data_size-=signlen;
123 }
124 --- a/ars.h
125 +++ b/ars.h
126 @@ -67,7 +67,7 @@
127 #define ARS_MAX_IP_SIZE 65535
128
129 #define ARS_IP_MF ((unsigned short)0x2000) /* more fragments */
130 -#define ARS_IP_DF ((unsigned short)0x4000) /* dont fragment */
131 +#define ARS_IP_DF ((unsigned short)0x4000) /* don't fragment */
132 #define ARS_IP_RF ((unsigned short)0x8000) /* reserved fragment flag */
133
134 #define ARS_IPOPT_COPY 0x80
135 @@ -308,7 +308,7 @@ struct ars_pseudohdr
136 __u32 daddr;
137 __u8 zero;
138 __u8 protocol;
139 - __u16 lenght;
140 + __u16 length;
141 };
142
143 /* The IGRP header structure */
144 --- a/sendip_handler.c
145 +++ b/sendip_handler.c
146 @@ -35,7 +35,7 @@ void send_ip_handler(char *packet, unsig
147 unsigned short fragment_flag = 0;
148
149 if (opt_mf) fragment_flag |= MF; /* more fragments */
150 - if (opt_df) fragment_flag |= DF; /* dont fragment */
151 + if (opt_df) fragment_flag |= DF; /* don't fragment */
152 send_ip((char*)&local.sin_addr,
153 (char*)&remote.sin_addr,
154 packet, size, fragment_flag, ip_frag_offset,