Merge pull request #363 from appneta/Bug_#362_lintain_detected_spell_…

…checks

Bug #362 Fix spelling mistakes

configure.ac

@@ -4,7 +4,7 @@ dnl $Id$
 AC_PREREQ([2.69])
 
 dnl Set version info here!
-AC_INIT([tcpreplay],[4.2.3],
+AC_INIT([tcpreplay],[4.2.4],
  [https:/appneta/tcpreplay/issues],
  [tcpreplay],
  [http://tcpreplay.sourceforge.net/])

docs/CHANGELOG

@@ -1,4 +1,7 @@
-04/12/2017 Version 4.2.3-beta1
+04/26/2017 Version 4.2.4
+ - Fix Lintian detected spelling errors (#362)
+
+04/12/2017 Version 4.2.3
  - Archive (remove) QuickTX until maintainer found (#357)
  - Ubuntu precise 32bit_build (#356)
 

src/common/sendpacket.c

@@ -932,7 +932,7 @@ sendpacket_open_pf(const char *device, char *errbuf)
 
  /* make sure it's not loopback (PF_PACKET doesn't support it) */
  if (ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER)
- warnx("Unsupported physical layer type 0x%04x on %s. Maybe it works, maybe it wont."
+ warnx("Unsupported physical layer type 0x%04x on %s. Maybe it works, maybe it won't."
  " See tickets #123/318", ifr.ifr_hwaddr.sa_family, device);
 
 #ifdef SO_BROADCAST

src/tcpbridge_opts.def

@@ -67,7 +67,7 @@ homerc = "$$/";
 
 explain = <<- EOExplain
 tcpbridge is a tool for selectively briding network traffic across two interfaces
-and optionally modifying the packets in betweeen
+and optionally modifying the packets in between
 EOExplain;
 
 detail = <<- EODetail
@@ -348,7 +348,7 @@ When enabling verbose mode (@var{-v}) you may also specify one or more
 additional arguments to pass to @code{tcpdump} to modify the way packets
 are decoded. By default, -n and -l are used. Be sure to
 quote the arguments like: --verbose="-axxx" so that they are not interpreted
-by tcpbridge. The following arguments are vaild:
+by tcpbridge. The following arguments are valid:
  [ -aAeNqRStuvxX ]
  [ -E spi@ipaddr algo:secret,... ]
  [ -s snaplen ]

src/tcpedit/plugins/dlt_en10mb/en10mb.c

@@ -100,7 +100,7 @@ dlt_en10mb_init(tcpeditdlt_t *ctx)
 
  /* vlan tags need an additional 4 bytes */
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "%s", "Unable to initalize unregistered plugin en10mb");
+ tcpedit_seterr(ctx->tcpedit, "%s", "Unable to initialize unregistered plugin en10mb");
  return TCPEDIT_ERROR;
  }
 

src/tcpedit/plugins/dlt_en10mb/en10mb_opts.def

@@ -46,7 +46,7 @@ flag = {
  descrip = "Substitute MAC addresses";
  doc = <<- EOText
 Allows you to rewrite ethernet MAC addresses of packets. It takes
-comma delimited pair or MACs address and rewrites all occurences of
+comma delimited pair or MACs address and rewrites all occurrences of
 the first MAC with the value of the second MAC.
 Example:
 @example

src/tcpedit/plugins/dlt_hdlc/hdlc.c

@@ -97,7 +97,7 @@ dlt_hdlc_init(tcpeditdlt_t *ctx)
  assert(ctx);
 
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "Unable to initalize unregistered plugin %s", dlt_name);
+ tcpedit_seterr(ctx->tcpedit, "Unable to initialize unregistered plugin %s", dlt_name);
  return TCPEDIT_ERROR;
  }
 

src/tcpedit/plugins/dlt_ieee80211/ieee80211.c

@@ -104,7 +104,7 @@ dlt_ieee80211_init(tcpeditdlt_t *ctx)
  assert(ctx);
 
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "Unable to initalize unregistered plugin %s", dlt_name);
+ tcpedit_seterr(ctx->tcpedit, "Unable to initialize unregistered plugin %s", dlt_name);
  return TCPEDIT_ERROR;
  }
 

src/tcpedit/plugins/dlt_linuxsll/linuxsll.c

@@ -99,7 +99,7 @@ dlt_linuxsll_init(tcpeditdlt_t *ctx)
  assert(ctx);
 
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "Unable to initalize unregistered plugin %s", dlt_name);
+ tcpedit_seterr(ctx->tcpedit, "Unable to initialize unregistered plugin %s", dlt_name);
  return TCPEDIT_ERROR;
  }
 

src/tcpedit/plugins/dlt_loop/loop.c

@@ -100,7 +100,7 @@ dlt_loop_init(tcpeditdlt_t *ctx)
  assert(ctx);
 
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "Unable to initalize unregistered plugin %s", dlt_name);
+ tcpedit_seterr(ctx->tcpedit, "Unable to initialize unregistered plugin %s", dlt_name);
  return TCPEDIT_ERROR;
  }
 

src/tcpedit/plugins/dlt_null/null.c

@@ -114,7 +114,7 @@ dlt_null_init(tcpeditdlt_t *ctx)
  assert(ctx);
 
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "Unable to initalize unregistered plugin %s", dlt_name);
+ tcpedit_seterr(ctx->tcpedit, "Unable to initialize unregistered plugin %s", dlt_name);
  return TCPEDIT_ERROR;
  } 
 

src/tcpedit/plugins/dlt_plugins.c

@@ -156,7 +156,7 @@ tcpedit_dlt_init(tcpedit_t *tcpedit, const int srcdlt)
  /* set our address type */
  ctx->addr_type = ctx->decoder->plugin_l2addr_type();
 
- /* initalize decoder plugin */
+ /* initialize decoder plugin */
  rcode = ctx->decoder->plugin_init(ctx);
  if (tcpedit_checkerror(ctx->tcpedit, rcode, NULL) != TCPEDIT_OK) {
  tcpedit_dlt_cleanup(ctx);
@@ -254,7 +254,7 @@ tcpedit_dlt_process(tcpeditdlt_t *ctx, u_char **packet, int pktlen, tcpr_dir_t d
 /**
  * \brief Call after tcpedit_dlt_post_args() to allow plugins to do special things
  * 
- * Useful for plugins to initalize sub-plugins and what not.
+ * Useful for plugins to initialize sub-plugins and what not.
  * Returns the standard TCPEDIT_OK|ERROR|WARN
  */
 int 

src/tcpedit/plugins/dlt_pppserial/pppserial.c

@@ -111,7 +111,7 @@ dlt_pppserial_init(tcpeditdlt_t *ctx)
  assert(ctx);
 
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "Unable to initalize unregistered plugin %s", dlt_name);
+ tcpedit_seterr(ctx->tcpedit, "Unable to initialize unregistered plugin %s", dlt_name);
  return TCPEDIT_ERROR;
  }
 

src/tcpedit/plugins/dlt_radiotap/radiotap.c

@@ -105,7 +105,7 @@ dlt_radiotap_init(tcpeditdlt_t *ctx)
  assert(ctx);
 
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "Unable to initalize unregistered plugin %s", dlt_name);
+ tcpedit_seterr(ctx->tcpedit, "Unable to initialize unregistered plugin %s", dlt_name);
  return TCPEDIT_ERROR;
  }
 

src/tcpedit/plugins/dlt_raw/raw.c

@@ -99,7 +99,7 @@ dlt_raw_init(tcpeditdlt_t *ctx)
  assert(ctx);
 
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "Unable to initalize unregistered plugin %s", dlt_name);
+ tcpedit_seterr(ctx->tcpedit, "Unable to initialize unregistered plugin %s", dlt_name);
  return TCPEDIT_ERROR;
  }
 

src/tcpedit/plugins/dlt_template/plugin.c.tmpl

@@ -115,7 +115,7 @@ dlt_%{plugin}_init(tcpeditdlt_t *ctx)
  assert(ctx);
 
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "Unable to initalize unregistered plugin %s", dlt_name);
+ tcpedit_seterr(ctx->tcpedit, "Unable to initialize unregistered plugin %s", dlt_name);
  return TCPEDIT_ERROR;
  }
 

src/tcpedit/plugins/dlt_user/user.c

@@ -97,7 +97,7 @@ dlt_user_init(tcpeditdlt_t *ctx)
  assert(ctx);
 
  if ((plugin = tcpedit_dlt_getplugin(ctx, dlt_value)) == NULL) {
- tcpedit_seterr(ctx->tcpedit, "Unable to initalize unregistered plugin %s", dlt_name);
+ tcpedit_seterr(ctx->tcpedit, "Unable to initialize unregistered plugin %s", dlt_name);
  return TCPEDIT_ERROR;
  }
 

src/tcpedit/plugins_api.h

@@ -44,7 +44,7 @@ tcpeditdlt_t *tcpedit_dlt_init(tcpedit_t *tcpedit, int srcdlt);
  */
 int tcpedit_dlt_post_init(tcpeditdlt_t *tcpedit);
 
-/* cleans up after ourselves. Called for each initalized plugin */
+/* cleans up after ourselves. Called for each initialized plugin */
 void tcpedit_dlt_cleanup(tcpeditdlt_t *ctx);
 
 /* What is the output DLT type? */

src/tcpedit/tcpedit_api.c

@@ -108,7 +108,7 @@ tcpedit_set_encoder_dltplugin_byname(tcpedit_t *tcpedit, const char *name)
 
 
 /**
- * Set wether we should edit broadcast & multicast IP addresses
+ * Set whether we should edit broadcast & multicast IP addresses
  */
 int
 tcpedit_set_skip_broadcast(tcpedit_t *tcpedit, bool value)

src/tcpedit/tcpedit_opts.def

@@ -71,7 +71,7 @@ flag = {
 Takes a comma delimited series of colon delimited CIDR
 netblock pairs. Each netblock pair is evaluated in order against
 the IP addresses. If the IP address in the packet matches the
-first netblock, it is rewriten using the second netblock as a
+first netblock, it is rewritten using the second netblock as a
 mask against the high order bits.
 
 IPv4 Example:
@@ -291,7 +291,7 @@ Possible fuzzing actions list:
  * Not all Bytes have the same probability of appearance in real life.
  Replace with 0x00, 0xFF, or a random byte with equal likelyhook
  * Not all Bytes have the same significance in a packet.
- Replace the start, the end, or the middle of the packet with equal likelyhood.
+ Replace the start, the end, or the middle of the packet with equal likelihood.
  * do nothing (7 out of 8 packets)
 
 EOText;

src/tcpliveplay.c

@@ -233,7 +233,7 @@ main(int argc, char **argv)
  /* Open socket for live traffic to be listed to*/
  live_handle = set_live_filter(iface, &myip, new_src_port); /* returns a pcap_t that filters out traffic other than TCP*/
  if (live_handle == NULL) {
- fprintf(stderr,"Error occured while listing on traffic: %s\n", errbuf);
+ fprintf(stderr,"Error occurred while listing on traffic: %s\n", errbuf);
  free(sched);
  return(2);
  }
@@ -1141,14 +1141,14 @@ fix_all_checksum_liveplay(ipv4_hdr *iphdr){
  /*Calculate TCP Checksum*/
  ret2 = do_checksum_liveplay((u_char *) iphdr,iphdr->ip_p, ntohs(iphdr->ip_len) - (iphdr->ip_hl << 2));
  if(ret2==-1){
- printf("*******An Error Occured calculating TCP Checksum*******\n");
+ printf("*******An Error Occurred calculating TCP Checksum*******\n");
  return -1;
  }
 
  /*Calculate IP Checksum*/
  ret1 = do_checksum_liveplay((u_char *) iphdr, IPPROTO_IP, ntohs(iphdr->ip_len));
  if(ret1==-1){
- printf("*******An Error Occured calculating IP Checksum*******\n");
+ printf("*******An Error Occurred calculating IP Checksum*******\n");
  return -1;
  }
 

src/tcpprep_opts.def

@@ -68,7 +68,7 @@ detail = <<- EODetail
 The basic operation of tcpreplay is to resend all packets from the
 input file(s) out a single file. Tcpprep processes a pcap file and 
 applies a set of user-specified rules to create a cache file which 
-tells tcpreplay wether or not to send each packet and which interface the
+tells tcpreplay whether or not to send each packet and which interface the
 packet should be sent out of.
 
 For more details, please see the Tcpreplay Manual at:
@@ -500,7 +500,7 @@ flag = {
 EONonip;
  doc = <<- EOText
 By default, non-IP traffic which can not be classified as client
-or server is classified as "client". Specifiying @samp{--nonip}
+or server is classified as "client". Specifying @samp{--nonip}
 will reclassify non-IP traffic as "server". Note that the meaning
 of this flag is reversed if @samp{--reverse} is used.
 EOText;

src/tree.c

@@ -555,7 +555,7 @@ add_tree_ipv6(const struct tcpr_in6_addr * addr, const u_char * data)
 }
 
 /**
- * calculates wether each node in the tree is a client, server, or unknown for each node in the tree
+ * calculates whether each node in the tree is a client, server, or unknown for each node in the tree
  */
 void
 tree_calculate(tcpr_data_tree_t *treeroot)