From: Pander Date: Sun, 2 Apr 2023 15:12:46 +0000 (+0200) Subject: doc, src: improve spelling X-Git-Tag: v3.24~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30ddb4f8aaa079ca40f54528c88cea8fddec172e;p=thirdparty%2Fxtables-addons.git doc, src: improve spelling --- diff --git a/INSTALL.rst b/INSTALL.rst index 69bbd8d..58df352 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -58,7 +58,7 @@ Configuring and compiling the right directory. (If not, you need to install something.) For RPM building, it should be ``/usr/src/linux-obj/...`` - or whatever location the distro makes use of. + or whatever location the distribution makes use of. ``--with-xtlibdir=`` Specifies the path to where the newly built extensions should diff --git a/README.rst b/README.rst index 988a41e..b5f43c6 100644 --- a/README.rst +++ b/README.rst @@ -9,6 +9,8 @@ patching and/or recompilation of either the kernel or Xtables/iptables is required. However, do see the INSTALL file for the minimum requirements of Xtables-addons. +See also https://inai.de/projects/xtables-addons/ + Included in this package ======================== diff --git a/extensions/ACCOUNT/iptaccount.8 b/extensions/ACCOUNT/iptaccount.8 index 414b93c..fea00aa 100644 --- a/extensions/ACCOUNT/iptaccount.8 +++ b/extensions/ACCOUNT/iptaccount.8 @@ -9,7 +9,7 @@ iptaccount \(em administrative utility to access xt_ACCOUNT statistics List all (accounting) table names. .PP \fB\-c\fP -Loop every second (abort with CTRL+C). +Loop every second (abort with Ctrl+C). .PP \fB\-f\fP Flush data after display. diff --git a/extensions/ACCOUNT/iptaccount.c b/extensions/ACCOUNT/iptaccount.c index b60a099..d6139e0 100644 --- a/extensions/ACCOUNT/iptaccount.c +++ b/extensions/ACCOUNT/iptaccount.c @@ -48,13 +48,13 @@ static char *addr_to_dotted(unsigned int addr) static void show_usage(void) { - printf("Unknown command line option. Try: [-u] [-h] [-a] [-f] [-c] [-s] [-l name]\n"); + printf("Unknown command-line option. Try: [-u] [-h] [-a] [-f] [-c] [-s] [-l name]\n"); printf("[-u] show kernel handle usage\n"); printf("[-h] free all kernel handles (experts only!)\n\n"); printf("[-a] list all table names\n"); printf("[-l name] show data in table \n"); printf("[-f] flush data after showing\n"); - printf("[-c] loop every second (abort with CTRL+C)\n"); + printf("[-c] loop every second (abort with Ctrl+C)\n"); printf("[-s] CSV output (for spreadsheet import)\n"); printf("\n"); } diff --git a/extensions/ACCOUNT/libxt_ACCOUNT.man b/extensions/ACCOUNT/libxt_ACCOUNT.man index 33c1b74..09a7e35 100644 --- a/extensions/ACCOUNT/libxt_ACCOUNT.man +++ b/extensions/ACCOUNT/libxt_ACCOUNT.man @@ -11,7 +11,7 @@ The largest possible subnet size is 24 bit, meaning for example 10.0.0.0/8 network. ACCOUNT uses fixed internal data structures which speeds up the processing of each packet. Furthermore, accounting data for one complete 192.168.1.X/24 network takes 4 KB of -memory. Memory for 16 or 24 bit networks is only allocated when +memory. Memory for 16-bit or 24-bit networks is only allocated when needed. .PP To optimize the kernel<->userspace data transfer a bit more, the diff --git a/extensions/ACCOUNT/xt_ACCOUNT.c b/extensions/ACCOUNT/xt_ACCOUNT.c index 7155509..9b1e711 100644 --- a/extensions/ACCOUNT/xt_ACCOUNT.c +++ b/extensions/ACCOUNT/xt_ACCOUNT.c @@ -68,7 +68,7 @@ struct ipt_acc_table { /** * Internal handle structure - * @ip: base IP address of the network. Used for caculating the final + * @ip: base IP address of the network. Used for calculating the final * address during get_data(). * @depth: size of the network; see above * @itemcount: number of addresses in this table @@ -82,7 +82,7 @@ struct ipt_acc_handle { /* Used for every IP entry Size is 32 bytes so that 256 (class C network) * 16 - fits in a double kernel (zero) page (two consecutive kernel pages)*/ + fits in a double kernel (zero) page (two consecutive kernel pages) */ struct ipt_acc_ip { uint64_t src_packets; uint64_t src_bytes; @@ -93,8 +93,8 @@ struct ipt_acc_ip { /* * The IP addresses are organized as an array so that direct slot * calculations are possible. - * Only 8-bit networks are preallocated, 16/24-bit networks - * allocate their slots when needed -> very efficent. + * Only 8-bit networks are preallocated, 16-bit and 24-bit networks + * allocate their slots when needed -> very efficient. */ struct ipt_acc_mask_24 { struct ipt_acc_ip ip[256]; @@ -140,13 +140,13 @@ static void ipt_acc_data_free(void *data, uint8_t depth) if (!data) return; - /* Free for 8 bit network */ + /* Free for 8-bit network */ if (depth == 0) { free_pages((unsigned long)data, 2); return; } - /* Free for 16 bit network */ + /* Free for 16-bit network */ if (depth == 1) { struct ipt_acc_mask_16 *mask_16 = data; unsigned int b; @@ -157,7 +157,7 @@ static void ipt_acc_data_free(void *data, uint8_t depth) return; } - /* Free for 24 bit network */ + /* Free for 24-bit network */ if (depth == 2) { unsigned int a, b; for (a = 0; a <= 255; a++) { @@ -366,7 +366,7 @@ static void ipt_acc_depth0_insert(struct ipt_acc_mask_24 *mask_24, /* Increase size counters */ if (is_src) { /* Calculate network slot */ - pr_debug("ACCOUNT: Calculated SRC 8 bit network slot: %d\n", src_slot); + pr_debug("ACCOUNT: Calculated SRC 8-bit network slot: %d\n", src_slot); if (!mask_24->ip[src_slot].src_packets && !mask_24->ip[src_slot].dst_packets) is_src_new_ip = true; @@ -375,7 +375,7 @@ static void ipt_acc_depth0_insert(struct ipt_acc_mask_24 *mask_24, mask_24->ip[src_slot].src_bytes += size; } if (is_dst) { - pr_debug("ACCOUNT: Calculated DST 8 bit network slot: %d\n", dst_slot); + pr_debug("ACCOUNT: Calculated DST 8-bit network slot: %d\n", dst_slot); if (!mask_24->ip[dst_slot].src_packets && !mask_24->ip[dst_slot].dst_packets) is_dst_new_ip = true; @@ -413,7 +413,7 @@ static void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16, /* Do we need to process src IP? */ if ((net_ip & netmask) == (src_ip & netmask)) { uint8_t slot = (ntohl(src_ip) & 0xFF00) >> 8; - pr_debug("ACCOUNT: Calculated SRC 16 bit network slot: %d\n", slot); + pr_debug("ACCOUNT: Calculated SRC 16-bit network slot: %d\n", slot); /* Do we need to create a new mask_24 bucket? */ if (!mask_16->mask_24[slot] && (mask_16->mask_24[slot] = @@ -429,7 +429,7 @@ static void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16, /* Do we need to process dst IP? */ if ((net_ip & netmask) == (dst_ip & netmask)) { uint8_t slot = (ntohl(dst_ip) & 0xFF00) >> 8; - pr_debug("ACCOUNT: Calculated DST 16 bit network slot: %d\n", slot); + pr_debug("ACCOUNT: Calculated DST 16-bit network slot: %d\n", slot); /* Do we need to create a new mask_24 bucket? */ if (!mask_16->mask_24[slot] && (mask_16->mask_24[slot] @@ -451,7 +451,7 @@ static void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8, /* Do we need to process src IP? */ if ((net_ip & netmask) == (src_ip & netmask)) { uint8_t slot = (ntohl(src_ip) & 0xFF0000) >> 16; - pr_debug("ACCOUNT: Calculated SRC 24 bit network slot: %d\n", slot); + pr_debug("ACCOUNT: Calculated SRC 24-bit network slot: %d\n", slot); /* Do we need to create a new mask_24 bucket? */ if (!mask_8->mask_16[slot] && (mask_8->mask_16[slot] @@ -467,7 +467,7 @@ static void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8, /* Do we need to process dst IP? */ if ((net_ip & netmask) == (dst_ip & netmask)) { uint8_t slot = (ntohl(dst_ip) & 0xFF0000) >> 16; - pr_debug("ACCOUNT: Calculated DST 24 bit network slot: %d\n", slot); + pr_debug("ACCOUNT: Calculated DST 24-bit network slot: %d\n", slot); /* Do we need to create a new mask_24 bucket? */ if (!mask_8->mask_16[slot] && (mask_8->mask_16[slot] @@ -502,7 +502,7 @@ ipt_acc_target(struct sk_buff *skb, const struct xt_action_param *par) return XT_CONTINUE; } - /* 8 bit network or "any" network */ + /* 8-bit network or "any" network */ if (ipt_acc_tables[info->table_nr].depth == 0) { /* Count packet and check if the IP is new */ ipt_acc_depth0_insert( @@ -514,7 +514,7 @@ ipt_acc_target(struct sk_buff *skb, const struct xt_action_param *par) return XT_CONTINUE; } - /* 16 bit network */ + /* 16-bit network */ if (ipt_acc_tables[info->table_nr].depth == 1) { ipt_acc_depth1_insert( ipt_acc_tables[info->table_nr].data, @@ -525,7 +525,7 @@ ipt_acc_target(struct sk_buff *skb, const struct xt_action_param *par) return XT_CONTINUE; } - /* 24 bit network */ + /* 24-bit network */ if (ipt_acc_tables[info->table_nr].depth == 2) { ipt_acc_depth2_insert( ipt_acc_tables[info->table_nr].data, @@ -644,7 +644,7 @@ static int ipt_acc_handle_prepare_read(struct ipt_acc_table *ipt_acc_tables, continue; if ((network_16->mask_24[b] = ipt_acc_zalloc_page()) == NULL) { - printk("ACCOUNT: out of memory during copy of 16 bit " + printk("ACCOUNT: out of memory during copy of 16-bit " "network in ipt_acc_handle_prepare_read()\n"); ipt_acc_data_free(dest->data, depth); return -1; @@ -665,7 +665,7 @@ static int ipt_acc_handle_prepare_read(struct ipt_acc_table *ipt_acc_tables, continue; if ((network_8->mask_16[a] = ipt_acc_zalloc_page()) == NULL) { - printk("ACCOUNT: out of memory during copy of 24 bit network" + printk("ACCOUNT: out of memory during copy of 24-bit network" " in ipt_acc_handle_prepare_read()\n"); ipt_acc_data_free(dest->data, depth); return -1; @@ -682,7 +682,7 @@ static int ipt_acc_handle_prepare_read(struct ipt_acc_table *ipt_acc_tables, continue; if ((network_16->mask_24[b] = ipt_acc_zalloc_page()) == NULL) { - printk("ACCOUNT: out of memory during copy of 16 bit" + printk("ACCOUNT: out of memory during copy of 16-bit" " network in ipt_acc_handle_prepare_read()\n"); ipt_acc_data_free(dest->data, depth); return -1; @@ -740,7 +740,7 @@ static int ipt_acc_handle_prepare_read_flush(struct ipt_acc_table *ipt_acc_table return 0; } -/* Copy 8 bit network data into a prepared buffer. +/* Copy 8-bit network data into a prepared buffer. We only copy entries != 0 to increase performance. */ static int ipt_acc_handle_copy_data(struct ipt_acc_net *ian, @@ -804,7 +804,7 @@ static int ipt_acc_handle_get_data(struct ipt_acc_net *ian, net_ip = ntohl(ian->ipt_acc_handles[handle].ip); depth = ian->ipt_acc_handles[handle].depth; - /* 8 bit network */ + /* 8-bit network */ if (depth == 0) { struct ipt_acc_mask_24 *network = ian->ipt_acc_handles[handle].data; @@ -820,7 +820,7 @@ static int ipt_acc_handle_get_data(struct ipt_acc_net *ian, return 0; } - /* 16 bit network */ + /* 16-bit network */ if (depth == 1) { struct ipt_acc_mask_16 *network_16 = ian->ipt_acc_handles[handle].data; @@ -843,7 +843,7 @@ static int ipt_acc_handle_get_data(struct ipt_acc_net *ian, return 0; } - /* 24 bit network */ + /* 24-bit network */ if (depth == 2) { struct ipt_acc_mask_8 *network_8 = ian->ipt_acc_handles[handle].data; diff --git a/extensions/libxt_DNETMAP.man b/extensions/libxt_DNETMAP.man index a59b655..41a1ec1 100644 --- a/extensions/libxt_DNETMAP.man +++ b/extensions/libxt_DNETMAP.man @@ -88,7 +88,7 @@ deleted unless the persistent flag is set. .PP \fB* Logging\fR .PP -The module logs binding add/timeout events to klog. This behaviour can be +The module logs binding add/timeout events to klog. This behavior can be disabled using the \fBdisable_log\fR module parameter. .PP \fB* Examples\fR diff --git a/extensions/libxt_PROTO.man b/extensions/libxt_PROTO.man index 4b0747f..6b610d1 100644 --- a/extensions/libxt_PROTO.man +++ b/extensions/libxt_PROTO.man @@ -14,7 +14,7 @@ This option is only valid for IPv6 rules. When specifying this option, the authentication extension header will be seen as a non-extension header. .PP For IPv4 packets, the \fBProtocol\fP field is modified and the checksum is -re-calculated. +recalculated. .PP For IPv6 packets, the scenario can be more complex due to the introduction of the extension headers mechanism. By default, the PROTO target will scan the IPv6 diff --git a/extensions/libxt_SYSRQ.man b/extensions/libxt_SYSRQ.man index d7b3da0..77fa3a5 100644 --- a/extensions/libxt_SYSRQ.man +++ b/extensions/libxt_SYSRQ.man @@ -1,7 +1,7 @@ .PP The SYSRQ target allows one to remotely trigger sysrq on the local machine over the network. This can be useful when vital parts of the machine hang, for -example an oops in a filesystem causing locks to be not released and processes +example an oops in a file system causing locks to be not released and processes to get stuck as a result \(em if still possible, use /proc/sysrq-trigger. Even when processes are stuck, interrupts are likely to be still processed, and as such, sysrq can be triggered through incoming network packets. @@ -71,7 +71,7 @@ echo "$req" | socat stdin udp\-sendto:$ipaddr:9 .fi .PP See the Linux docs for possible sysrq keys. Important ones are: re(b)oot, -power(o)ff, (s)ync filesystems, (u)mount and remount readonly. More than one +power(o)ff, (s)ync file systems, (u)mount and remount readonly. More than one sysrq key can be used at once, but bear in mind that, for example, a sync may not complete before a subsequent reboot or poweroff. .PP diff --git a/extensions/libxt_asn.c b/extensions/libxt_asn.c index e9c59b4..4d09510 100644 --- a/extensions/libxt_asn.c +++ b/extensions/libxt_asn.c @@ -37,7 +37,7 @@ static void asn_help(void) "[!] --dst-asn, --destination-number number[,number...]\n" " Match packet going to (one of) the specified ASN(s)\n" "\n" - "NOTE: The number is inputed by its ISO3166 code.\n" + "NOTE: The number is inputed by its ISO 3166 code.\n" "\n" ); } diff --git a/extensions/libxt_asn.man b/extensions/libxt_asn.man index 7032cd7..b35cb5d 100644 --- a/extensions/libxt_asn.man +++ b/extensions/libxt_asn.man @@ -9,7 +9,7 @@ Match packet going to (one of) the specified ASN(s) .TP .PP The extra files you will need are the binary database files. They are generated -from a ASN-subnet database with the asn_build_db.pl tool that is shipped +from an ASN-subnet database with the asn_build_db.pl tool that is shipped with the source package, and which should be available in compiled packages in /usr/lib(exec)/xtables-addons/. The first command retrieves CSV files from MaxMind, while the other two build packed bisectable range files: diff --git a/extensions/libxt_geoip.c b/extensions/libxt_geoip.c index 2dc72ab..e29998a 100644 --- a/extensions/libxt_geoip.c +++ b/extensions/libxt_geoip.c @@ -36,7 +36,7 @@ static void geoip_help(void) "[!] --dst-cc, --destination-country country[,country...]\n" " Match packet going to (one of) the specified country(ies)\n" "\n" - "NOTE: The country is inputed by its ISO3166 code.\n" + "NOTE: The country is inputed by its ISO 3166 code.\n" "\n" ); } @@ -157,7 +157,7 @@ check_geoip_cc(char *cc, u_int16_t cc_used[], u_int8_t count) u_int16_t cc_int16; if (strlen(cc) != 2) /* Country must be 2 chars long according - to the ISO3166 standard */ + to the ISO 3166 standard */ xtables_error(PARAMETER_PROBLEM, "geoip: invalid country code '%s'", cc); @@ -170,7 +170,7 @@ check_geoip_cc(char *cc, u_int16_t cc_used[], u_int8_t count) xtables_error(PARAMETER_PROBLEM, "geoip: invalid country code '%s'", cc); - /* Convert chars into a single 16 bit integer. + /* Convert chars into a single 16-bit integer. * FIXME: This assumes that a country code is * exactly 2 chars long. If this is * going to change someday, this whole diff --git a/extensions/libxt_geoip.man b/extensions/libxt_geoip.man index 2f739b6..d33677b 100644 --- a/extensions/libxt_geoip.man +++ b/extensions/libxt_geoip.man @@ -8,7 +8,7 @@ Match packet coming from (one of) the specified country(ies) Match packet going to (one of) the specified country(ies) .TP NOTE: -The country is inputed by its ISO-3166 code. +The country is inputed by its ISO 3166 code. .PP The extra files you will need is the binary database files. They are generated from a country-subnet database with the geoip_build_db.pl tool that is shipped diff --git a/extensions/pknock/libxt_pknock.man b/extensions/pknock/libxt_pknock.man index a30ab95..da97b1c 100644 --- a/extensions/pknock/libxt_pknock.man +++ b/extensions/pknock/libxt_pknock.man @@ -23,7 +23,7 @@ iptables \-A INPUT \-p tcp \-m pknock \-\-knockports 4002,4001,4004 \-\-strict The rule will allow tcp port 22 for the attempting IP address after the successful reception of TCP SYN packets to ports 4002, 4001 and 4004, in this order (a.k.a. port-knocking). Port numbers in the connect sequence must follow the exact specification, no -other ports may be "knocked" inbetween. The rule is named '\fBSSH\fP' \(em a file of +other ports may be "knocked" in between. The rule is named '\fBSSH\fP' \(em a file of the same name for tracking port knocking states will be created in \fB/proc/net/xt_pknock\fP . Successive port knocks must occur with delay of at most 10 seconds. Port 22 (from the example) will diff --git a/extensions/pknock/xt_pknock.c b/extensions/pknock/xt_pknock.c index 287d525..07f14d1 100644 --- a/extensions/pknock/xt_pknock.c +++ b/extensions/pknock/xt_pknock.c @@ -128,7 +128,7 @@ MODULE_PARM_DESC(nl_multicast_group, "Netlink multicast group number for pknock * @len: length * @initval * @max - * @return: a 32 bits index + * @return: a 32-bit index */ static inline uint32_t pknock_hash(const void *key, uint32_t len, uint32_t initval, uint32_t max) @@ -347,7 +347,7 @@ has_logged_during_this_minute(const struct peer *peer) } /** - * Garbage collector. It removes the old entries after tis timers have expired. + * Garbage collector. It removes the old entries after its timers have expired. * * @r: rule */ diff --git a/extensions/xt_fuzzy.c b/extensions/xt_fuzzy.c index b715751..051db77 100644 --- a/extensions/xt_fuzzy.c +++ b/extensions/xt_fuzzy.c @@ -74,7 +74,7 @@ fuzzy_mt(const struct sk_buff *skb, struct xt_action_param *par) amount = info->present_time - info->previous_time; } else { /* - * There was a transition: I choose to re-sample + * There was a transition: I choose to resample * and keep the old acceptance rate... */ amount = 0; @@ -101,7 +101,7 @@ fuzzy_mt(const struct sk_buff *skb, struct xt_action_param *par) * denominator proportional to (howhigh+howlow) but, in this * particular case, that expression is constant. * - * An imediate consequence is that it is not necessary to call + * An immediate consequence is that it is not necessary to call * both mf_high and mf_low - but to keep things understandable, * I did so. */ diff --git a/extensions/xt_geoip.c b/extensions/xt_geoip.c index 559f903..900e417 100644 --- a/extensions/xt_geoip.c +++ b/extensions/xt_geoip.c @@ -295,7 +295,7 @@ static int xt_geoip_mt_checkentry(const struct xt_mtchk_param *par) } } - /* Overwrite the now-useless pointer info->mem[i] with + /* Overwrite the, now useless, pointer info->mem[i] with * a pointer to the node's kernelspace structure. * This avoids searching for a node in the match() and * destroy() functions. diff --git a/extensions/xt_ipp2p.c b/extensions/xt_ipp2p.c index 2a9f3e4..e311926 100644 --- a/extensions/xt_ipp2p.c +++ b/extensions/xt_ipp2p.c @@ -57,7 +57,7 @@ udp_search_edk(const unsigned char *t, const unsigned int packet_len) switch (t[0]) { case 0xe3: - /* edonkey */ + /* eDonkey */ switch (t[1]) { /* client -> server status request */ case 0x96: @@ -270,13 +270,13 @@ udp_search_bit(const unsigned char *haystack, const unsigned int packet_len) /* packetlen must be bigger than 32 */ /* first 4 bytes are zero */ if (packet_len > 32 && get_u32(haystack, 0) == 0x00000000) { - /* first rule: 00 00 00 00 01 00 00 xx xx xx xx 00 00 00 00*/ + /* first rule: 00 00 00 00 01 00 00 xx xx xx xx 00 00 00 00 */ if (get_u32(haystack, 4) == 0x00000000 && get_u32(haystack, 8) == 0x00010000 && get_u32(haystack, 16) == 0x00000000) return IPP2P_BIT * 100 + 71; - /* 00 01 00 00 0d 00 00 xx xx xx xx 00 00 00 00*/ + /* 00 01 00 00 0d 00 00 xx xx xx xx 00 00 00 00 */ if (get_u32(haystack, 4) == 0x00000001 && get_u32(haystack, 8) == 0x000d0000 && get_u32(haystack, 16) == 0x00000000) @@ -329,7 +329,7 @@ search_ares(const unsigned char *payload, const unsigned int plen) return IPP2P_ARES * 100 + 1; if (plen == 60) - /* possible download command*/ + /* possible download command */ if (payload[59] == 0x0a && payload[58] == 0x0a) if (memcmp(t, "PUSH SHA1:", 10) == 0) /* found download command */ @@ -439,7 +439,7 @@ search_soul(const unsigned char *payload, const unsigned int plen) } /* match 14 00 00 00 01 yy 00 00 00 STRING(YY) 01 00 00 00 00 46|50 00 00 00 00 */ - /* without size at the beginning !!! */ + /* without size at the beginning! */ if (get_u32(payload, 0) == 0x14 && get_u8(payload, 4) == 0x01) { uint32_t y = get_u32(payload, 5); @@ -581,7 +581,7 @@ search_kazaa(const unsigned char *payload, const unsigned int plen) return 0; } -/* check for gnutella get command */ +/* check for Gnutella get command */ static unsigned int search_gnu(const unsigned char *payload, const unsigned int plen) { @@ -596,7 +596,7 @@ search_gnu(const unsigned char *payload, const unsigned int plen) return 0; } -/* check for gnutella get commands and other typical data */ +/* check for Gnutella get commands and other typical data */ static unsigned int search_all_gnu(const unsigned char *payload, const unsigned int plen) { @@ -666,7 +666,7 @@ search_all_kazaa(const unsigned char *payload, const unsigned int plen) return 0; } -/* fast check for edonkey file segment transfer command */ +/* fast check for eDonkey file segment transfer command */ static unsigned int search_edk(const unsigned char *payload, const unsigned int plen) { @@ -682,7 +682,7 @@ search_edk(const unsigned char *payload, const unsigned int plen) } } -/* intensive but slower search for some edonkey packets including size-check */ +/* intensive but slower search for some eDonkey packets including size check */ static unsigned int search_all_edk(const unsigned char *payload, const unsigned int plen) { @@ -776,7 +776,7 @@ search_xdcc(const unsigned char *payload, const unsigned int plen) const uint16_t end = plen - 13; /* - * is seems to be a irc private massage, chedck for + * is seems to be an IRC private massage, check for * xdcc command */ while (x < end) { diff --git a/extensions/xt_psd.c b/extensions/xt_psd.c index 4a0cb23..b6c717f 100644 --- a/extensions/xt_psd.c +++ b/extensions/xt_psd.c @@ -256,7 +256,7 @@ static void remove_oldest(struct host **head, struct host *curr) struct host *h, *last = NULL; /* - * We are going to re-use the oldest list entry, so remove it from the + * We are going to reuse the oldest list entry, so remove it from the * hash table first, if it is really already in use. */ h = *head; @@ -322,7 +322,7 @@ handle_packet4(const struct iphdr *iph, const struct tcphdr *tcph, /* We know this address, but the entry is outdated. Mark it unused, and * remove from the hash table. We'll allocate a new entry instead since - * this one might get re-used too soon. */ + * this one might get reused too soon. */ curr4 = host_to_host4(curr); curr4->saddr = 0; ht_unlink(head, last); diff --git a/geoip/xt_geoip_query.1 b/geoip/xt_geoip_query.1 index 85e292e..926f349 100644 --- a/geoip/xt_geoip_query.1 +++ b/geoip/xt_geoip_query.1 @@ -24,7 +24,7 @@ Specifies IPv4 data only. Specifies IPv6 data only. .TP \fIcc\fP [ \fIcc\fP ... ] -The ISO-3166 country code names of the desired countries' databases. +The ISO 3166 country code names of the desired countries' databases. .SH Application .PP Shell command to dump the list of Swiss IPv6 address ranges: diff --git a/include/linux/netfilter/nf_conntrack_tuple_common.h b/include/linux/netfilter/nf_conntrack_tuple_common.h index 2f6bbc5..628fe31 100644 --- a/include/linux/netfilter/nf_conntrack_tuple_common.h +++ b/include/linux/netfilter/nf_conntrack_tuple_common.h @@ -30,7 +30,7 @@ union nf_conntrack_man_proto { __be16 port; } sctp; struct { - __be16 key; /* GRE key is 32bit, PPtP only uses 16bit */ + __be16 key; /* GRE key is 32-bit, PPtP only uses 16-bit */ } gre; };