Merge pull request #348 from jsoref/spelling

Spelling fixes

26 files changed, 95 insertions, 95 deletions

diff --git a/README.nDPI b/README.nDPI
index e189db765..0fe5eb1d0 100644
--- a/README.nDPI
+++ b/README.nDPI
@@ -1,4 +1,4 @@
-rerequisites for Compilation
+Prerequisites for Compilation
 -----------------------------
 
 Prerequisites
diff --git a/example/ndpiReader.c b/example/ndpiReader.c
index e7761e7f7..a631b68be 100644
--- a/example/ndpiReader.c
+++ b/example/ndpiReader.c
@@ -52,7 +52,7 @@
 #include "ndpi_util.h"
 
 /** Client parameters **/
-static char *_pcap_file[MAX_NUM_READER_THREADS]; /**< Ingress pcap file/interafaces */
+static char *_pcap_file[MAX_NUM_READER_THREADS]; /**< Ingress pcap file/interfaces */
 static FILE *playlist_fp[MAX_NUM_READER_THREADS] = { NULL }; /**< Ingress playlist */
 static FILE *results_file = NULL;
 static char *results_path = NULL;
@@ -867,7 +867,7 @@ static void printResults(u_int64_t tot_usec) {
   if(json_flag) {
 #ifdef HAVE_JSON_C
     if((json_fp = fopen(_jsonFilePath,"w")) == NULL) {
-      printf("Error createing .json file %s\n", _jsonFilePath);
+      printf("Error creating .json file %s\n", _jsonFilePath);
       json_flag = 0;
     } else {
       jObj_main = json_object_new_object();
@@ -1183,7 +1183,7 @@ static void pcap_packet_callback_checked(u_char *args,
 
   /* check for buffer changes */
   if(memcmp(packet, packet_checked, header->caplen) != 0)
-    printf("INTERNAL ERROR: ingress packet was nodified by nDPI: this should not happen [thread_id=%u, packetId=%lu]\n",
+    printf("INTERNAL ERROR: ingress packet was modified by nDPI: this should not happen [thread_id=%u, packetId=%lu]\n",
 	   thread_id, (unsigned long)ndpi_thread_info[thread_id].workflow->stats.raw_packet_count);
   free(packet_checked);
 }
diff --git a/example/ndpi_util.c b/example/ndpi_util.c
index 7741faf36..105459054 100644
--- a/example/ndpi_util.c
+++ b/example/ndpi_util.c
@@ -353,7 +353,7 @@ static struct ndpi_flow_info *get_ndpi_flow_info(struct ndpi_workflow * workflow
       } else {
 	inet_ntop(AF_INET6, &iph6->ip6_src, newflow->lower_name, sizeof(newflow->lower_name));
 	inet_ntop(AF_INET6, &iph6->ip6_dst, newflow->upper_name, sizeof(newflow->upper_name));
-	/* For consistency across platfoms replace :0: with :: */
+	/* For consistency across platforms replace :0: with :: */
 	patchIPv6Address(newflow->lower_name), patchIPv6Address(newflow->upper_name);
       }
 
diff --git a/example/protos.txt b/example/protos.txt
index 4c995f543..b3f24ddb5 100644
--- a/example/protos.txt
+++ b/example/protos.txt
@@ -10,7 +10,7 @@ tcp:3000@ntop
 #  Format:
 #  host:"<value>",host:"<value>",.....@<subproto>
 
-host:"googlesyndacation.com"@Google
+host:"googlesyndication.com"@Google
 host:"venere.com"@Venere
 host:"kataweb.it",host:"repubblica.it"@Repubblica
 host:"ntop"@ntop
diff --git a/packages/ubuntu/debian/rules b/packages/ubuntu/debian/rules
index 0000bdaf5..a5fbcda09 100755
--- a/packages/ubuntu/debian/rules
+++ b/packages/ubuntu/debian/rules
@@ -5,7 +5,7 @@
 
 #
 # debian/compat
-# We should use at least comparibily version 5
+# We should use at least compatibility version 5
 # but this requires the whole building process
 # to be remade and this is something we leave
 # to when we will have more time
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index b74f384e6..2e453689b 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -103,7 +103,7 @@
 #define NDPI_PROTOCOL_SSL_NO_CERT 	 64 /* SSL without certificate (Skype Ultrasurf?) - ntop.org */
 #define NDPI_PROTOCOL_IRC 	 65
 #define NDPI_PROTOCOL_AYIYA 	 66
-#define NDPI_PROTOCOL_UNENCRYPED_JABBER 	 67
+#define NDPI_PROTOCOL_UNENCRYPTED_JABBER 	 67
 #define NDPI_PROTOCOL_MSN 	 68
 #define NDPI_PROTOCOL_OSCAR 	 69
 #define NDPI_PROTOCOL_YAHOO 	 70
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index 68e332c23..cd10d3dd1 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -170,7 +170,7 @@ struct ndpi_wifi_header
   u_char trsm[6];
   u_char dest[6];
   u_int16_t seq_ctrl;
-  /* u_int64_t ccmp - for data encription only - check fc.flag */
+  /* u_int64_t ccmp - for data encryption only - check fc.flag */
 } PACK_OFF;
 
 /* +++++++++++++++++++++++ MPLS header +++++++++++++++++++++++ */
@@ -348,7 +348,7 @@ struct ndpi_id_struct {
   /**
      detected_protocol_bitmask:
      access this bitmask to find out whether an id has used skype or not
-     if a flag is set here, it will not be resetted
+     if a flag is set here, it will not be reset
      to compare this, use:
   **/
   NDPI_PROTOCOL_BITMASK detected_protocol_bitmask;
@@ -385,7 +385,7 @@ struct ndpi_id_struct {
 #ifdef NDPI_PROTOCOL_ZATTOO
   u_int32_t zattoo_ts;
 #endif
-#ifdef NDPI_PROTOCOL_UNENCRYPED_JABBER
+#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
   u_int32_t jabber_stun_or_ft_ts;
 #endif
 #ifdef NDPI_PROTOCOL_DIRECTCONNECT
@@ -404,7 +404,7 @@ struct ndpi_id_struct {
   u_int16_t bt_port_t[NDPI_BT_PORTS];
   u_int16_t bt_port_u[NDPI_BT_PORTS];
 #endif
-#ifdef NDPI_PROTOCOL_UNENCRYPED_JABBER
+#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
 #define JABBER_MAX_STUN_PORTS 6
   u_int16_t jabber_voice_stun_port[JABBER_MAX_STUN_PORTS];
   u_int16_t jabber_file_transfer_port[2];
@@ -425,7 +425,7 @@ struct ndpi_id_struct {
 #ifdef NDPI_PROTOCOL_OSCAR
   u_int8_t oscar_ssl_session_id[33];
 #endif
-#ifdef NDPI_PROTOCOL_UNENCRYPED_JABBER
+#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
   u_int8_t jabber_voice_stun_used_ports;
 #endif
 #ifdef NDPI_PROTOCOL_SIP
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 2bf1a103e..87d479fd7 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -528,7 +528,7 @@ static void addDefaultPort(ndpi_port_range *range,
   NOTE
 
   This function must be called with a semaphore set, this in order to avoid
-  changing the datastrutures while using them
+  changing the datastructures while using them
 */
 static int removeDefaultPort(ndpi_port_range *range,
 			     ndpi_proto_defaults_t *def,
@@ -605,7 +605,7 @@ int ndpi_add_content_subprotocol(struct ndpi_detection_module_struct *ndpi_struc
   NOTE
 
   This function must be called with a semaphore set, this in order to avoid
-  changing the datastrutures while using them
+  changing the datastructures while using them
 */
 static int ndpi_remove_host_url_subprotocol(struct ndpi_detection_module_struct *ndpi_struct,
 					    char *value, int protocol_id) {
@@ -1037,9 +1037,9 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
 			  no_master, "Ayiya", NDPI_PROTOCOL_CATEGORY_NETWORK,
 			  ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
 			  ndpi_build_default_ports(ports_b, 5072, 0, 0, 0, 0) /* UDP */);
-  ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_UNENCRYPED_JABBER,
+  ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_UNENCRYPTED_JABBER,
 			  no_master,
-			  no_master, "Unencryped_Jabber", NDPI_PROTOCOL_CATEGORY_WEB,
+			  no_master, "Unencrypted_Jabber", NDPI_PROTOCOL_CATEGORY_WEB,
 			  ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
 			  ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
   ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_OSCAR,
@@ -2211,7 +2211,7 @@ void ndpi_set_bitmask_protocol_detection( char * label,
     }
 
     /*
-      Set function and index protocol within proto_default strcuture for port protocol detection
+      Set function and index protocol within proto_default structure for port protocol detection
       and callback_buffer function for DPI protocol detection
     */
     ndpi_struct->proto_defaults[ndpi_protocol_id].protoIdx = idx;
@@ -3012,7 +3012,7 @@ static int ndpi_init_packet_header(struct ndpi_detection_module_struct *ndpi_str
 void ndpi_connection_tracking(struct ndpi_detection_module_struct *ndpi_struct,
 			      struct ndpi_flow_struct *flow)
 {
-  /* const for gcc code optimisation and cleaner code */
+  /* const for gcc code optimization and cleaner code */
   struct ndpi_packet_struct *packet = &flow->packet;
   const struct ndpi_iphdr *iph = packet->iph;
 #ifdef NDPI_DETECTION_SUPPORT_IPV6
@@ -3067,7 +3067,7 @@ void ndpi_connection_tracking(struct ndpi_detection_module_struct *ndpi_struct,
     }
     if((flow->next_tcp_seq_nr[0] == 0 && flow->next_tcp_seq_nr[1] == 0)
        || (proxy_enabled && (flow->next_tcp_seq_nr[0] == 0 || flow->next_tcp_seq_nr[1] == 0))) {
-      /* initalize tcp sequence counters */
+      /* initialize tcp sequence counters */
       /* the ack flag needs to be set to get valid sequence numbers from the other
        * direction. Usually it will catch the second packet syn+ack but it works
        * also for asymmetric traffic where it will use the first data packet
diff --git a/src/lib/protocols/ayiya.c b/src/lib/protocols/ayiya.c
index 59f319f9c..6e5401093 100644
--- a/src/lib/protocols/ayiya.c
+++ b/src/lib/protocols/ayiya.c
@@ -51,11 +51,11 @@ void ndpi_search_ayiya(struct ndpi_detection_module_struct *ndpi_struct, struct
       /* FINISH */
       struct ayiya *a = (struct ayiya*)packet->payload;
       u_int32_t epoch = ntohl(a->epoch), now;
-      u_int32_t fireyears = 86400 * 365 * 5;
+      u_int32_t fiveyears = 86400 * 365 * 5;
 
       now = flow->packet.tick_timestamp;
 
-      if((epoch >= (now - fireyears)) && (epoch <= (now+86400 /* 1 day */)))      
+      if((epoch >= (now - fiveyears)) && (epoch <= (now+86400 /* 1 day */)))      
 	ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_AYIYA, NDPI_PROTOCOL_UNKNOWN);
 
       return;
diff --git a/src/lib/protocols/btlib.c b/src/lib/protocols/btlib.c
index beea43d0d..5685eb7e9 100644
--- a/src/lib/protocols/btlib.c
+++ b/src/lib/protocols/btlib.c
@@ -401,7 +401,7 @@ void cb_data(bt_parse_data_cb_t *cbd,int *ret) {
     p->e_len = cbd->v.s.l;
     return;
   }
-  // DEBUG_TRACE(print_safe_str("UKNOWN",cbd));
+  // DEBUG_TRACE(print_safe_str("UNKNOWN",cbd));
 }
 
 
diff --git a/src/lib/protocols/btlib.h b/src/lib/protocols/btlib.h
index b68adbad1..a9ca53786 100644
--- a/src/lib/protocols/btlib.h
+++ b/src/lib/protocols/btlib.h
@@ -150,9 +150,9 @@ struct bt_parse_protocol {
 		struct bt_nodes6_data *nodes6;
 		u_int16_t	name_len;
 		u_int16_t	nn;		// nodes num
-		u_int16_t	nv;		// valuse num
+		u_int16_t	nv;		// values num
 		u_int16_t	nn6;		// nodes6 num
-		u_int16_t	nv6;		// valuse6 num
+		u_int16_t	nv6;		// values6 num
 		u_int16_t	port;
 		u_int16_t	t_len;
 	} r;
diff --git a/src/lib/protocols/ftp_data.c b/src/lib/protocols/ftp_data.c
index 47b45ec4c..f5622ffb5 100644
--- a/src/lib/protocols/ftp_data.c
+++ b/src/lib/protocols/ftp_data.c
@@ -62,7 +62,7 @@ static int ndpi_match_file_header(struct ndpi_detection_module_struct *ndpi_stru
   struct ndpi_packet_struct *packet = &flow->packet;
   u_int32_t payload_len = packet->payload_packet_len;
 
-  /* A FTP packet is pretty long so 256 is a bit consrvative but it should be OK */
+  /* A FTP packet is pretty long so 256 is a bit conservative but it should be OK */
   if(packet->payload_packet_len < 256)
     return 0;
 
diff --git a/src/lib/protocols/gnutella.c b/src/lib/protocols/gnutella.c
index e45096391..1ead0570b 100644
--- a/src/lib/protocols/gnutella.c
+++ b/src/lib/protocols/gnutella.c
@@ -203,7 +203,7 @@ void ndpi_search_gnutella(struct ndpi_detection_module_struct *ndpi_struct, stru
 	&& packet->payload[packet->payload_packet_len - 2] == 0x0a) {
       if (packet->payload_packet_len > 3 && memcmp(packet->payload, "GIV", 3) == 0) {
 	NDPI_LOG(NDPI_PROTOCOL_GNUTELLA, ndpi_struct, NDPI_LOG_TRACE, "MORPHEUS GIV DETECTED\n");
-	/* Not Excludeing the flow now.. We shall Check the next Packet too for Gnutella Patterns */
+	/* Not Excluding the flow now.. We shall Check the next Packet too for Gnutella Patterns */
 	return;
       }
     }
diff --git a/src/lib/protocols/http.c b/src/lib/protocols/http.c
index 82167e204..33b15c689 100644
--- a/src/lib/protocols/http.c
+++ b/src/lib/protocols/http.c
@@ -847,7 +847,7 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
       }
 
       /* check PPStream protocol or iQiyi service
-	 (iqiyi is deliverd by ppstream) */
+	 (iqiyi is delivered by ppstream) */
       // substring in url
       if(strstr((const char*) &packet->payload[filename_start], "iqiyi.com") != NULL) {
 	if(kxun_counter == 0) {
@@ -903,7 +903,7 @@ static void ndpi_check_http_tcp(struct ndpi_detection_module_struct *ndpi_struct
 
       if(packet->host_line.ptr != NULL) {
 	/**
-	   nDPI is pretty scrupoulous about HTTP so it waits until the
+	   nDPI is pretty scrupulous about HTTP so it waits until the
 	   HTTP response is received just to check that it conforms
 	   with the HTTP specs. However this might be a waste of time as
 	   in 99.99% of the cases is like that.
@@ -1181,7 +1181,7 @@ void init_http_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
   NDPI_BITMASK_SET(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask,
   		   ndpi_struct->callback_buffer[a].detection_bitmask);
 
-  /*Delete protocol from exluded protocol bitmask*/
+  /*Delete protocol from excluded protocol bitmask*/
   NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_UNKNOWN);
 
   NDPI_DEL_PROTOCOL_FROM_BITMASK(ndpi_struct->callback_buffer[a].excluded_protocol_bitmask, NDPI_PROTOCOL_QQ);
diff --git a/src/lib/protocols/irc.c b/src/lib/protocols/irc.c
index e63e7a7b2..b2b73ac5f 100644
--- a/src/lib/protocols/irc.c
+++ b/src/lib/protocols/irc.c
@@ -141,14 +141,14 @@ static u_int8_t ndpi_check_for_IRC_traces(const u_int8_t * ptr, u_int16_t len)
 }
 
 
-u_int8_t ndpi_search_irc_ssl_detect_ninty_percent_but_very_fast(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
+u_int8_t ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
 {
 
   struct ndpi_packet_struct *packet = &flow->packet;
 	
 
   NDPI_LOG(NDPI_PROTOCOL_IRC, ndpi_struct, NDPI_LOG_DEBUG,
-	   "called ndpi_search_irc_ssl_detect_ninty_percent_but_very_fast\n");
+	   "called ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast\n");
 
   /* case 1: len 1460, len 1460, len 1176 several times in one direction, than len = 4, 4096, 8192 in the other direction */
   if (packet->payload_packet_len == 1460
@@ -475,7 +475,7 @@ void ndpi_search_irc_tcp(struct ndpi_detection_module_struct *ndpi_struct, struc
     }
   }
   if (flow->detected_protocol_stack[0] != NDPI_PROTOCOL_IRC &&
-      ndpi_search_irc_ssl_detect_ninty_percent_but_very_fast(ndpi_struct, flow) != 0) {
+      ndpi_search_irc_ssl_detect_ninety_percent_but_very_fast(ndpi_struct, flow) != 0) {
     return;
   }
 
diff --git a/src/lib/protocols/jabber.c b/src/lib/protocols/jabber.c
index 8457df7dd..d8be54adf 100644
--- a/src/lib/protocols/jabber.c
+++ b/src/lib/protocols/jabber.c
@@ -25,7 +25,7 @@
 
 #include "ndpi_api.h"
 
-#ifdef NDPI_PROTOCOL_UNENCRYPED_JABBER
+#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
 struct jabber_string {
   char *string;
   u_int ndpi_protocol;
@@ -70,19 +70,19 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 
   u_int16_t x;
 
-  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_TRACE, "JABBER detection....\n");
+  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_TRACE, "JABBER detection....\n");
 
   /* search for jabber file transfer */
   /* this part is working asymmetrically */
   if (packet->tcp != NULL && packet->tcp->syn != 0 && packet->payload_packet_len == 0) {
-    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "check jabber syn\n");
+    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "check jabber syn\n");
     if (src != NULL && src->jabber_file_transfer_port[0] != 0) {
-      NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
+      NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
 	       "src jabber ft port set, ports are: %u, %u\n", ntohs(src->jabber_file_transfer_port[0]),
 	       ntohs(src->jabber_file_transfer_port[1]));
       if (((u_int32_t)
 	   (packet->tick_timestamp - src->jabber_stun_or_ft_ts)) >= ndpi_struct->jabber_file_transfer_timeout) {
-	NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+	NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 		 NDPI_LOG_DEBUG, "JABBER src stun timeout %u %u\n", src->jabber_stun_or_ft_ts,
 		 packet->tick_timestamp);
 	src->jabber_file_transfer_port[0] = 0;
@@ -91,20 +91,20 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 		 || src->jabber_file_transfer_port[0] == packet->tcp->source
 		 || src->jabber_file_transfer_port[1] == packet->tcp->dest
 		 || src->jabber_file_transfer_port[1] == packet->tcp->source) {
-	NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
+	NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
 		 "found jabber file transfer.\n");
 
 	ndpi_int_jabber_add_connection(ndpi_struct, flow,
-				       NDPI_PROTOCOL_UNENCRYPED_JABBER);
+				       NDPI_PROTOCOL_UNENCRYPTED_JABBER);
       }
     }
     if (dst != NULL && dst->jabber_file_transfer_port[0] != 0) {
-      NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
+      NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
 	       "dst jabber ft port set, ports are: %u, %u\n", ntohs(dst->jabber_file_transfer_port[0]),
 	       ntohs(dst->jabber_file_transfer_port[1]));
       if (((u_int32_t)
 	   (packet->tick_timestamp - dst->jabber_stun_or_ft_ts)) >= ndpi_struct->jabber_file_transfer_timeout) {
-	NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+	NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 		 NDPI_LOG_DEBUG, "JABBER dst stun timeout %u %u\n", dst->jabber_stun_or_ft_ts,
 		 packet->tick_timestamp);
 	dst->jabber_file_transfer_port[0] = 0;
@@ -113,11 +113,11 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 		 || dst->jabber_file_transfer_port[0] == packet->tcp->source
 		 || dst->jabber_file_transfer_port[1] == packet->tcp->dest
 		 || dst->jabber_file_transfer_port[1] == packet->tcp->source) {
-	NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
+	NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
 		 "found jabber file transfer.\n");
 
 	ndpi_int_jabber_add_connection(ndpi_struct, flow,
-				       NDPI_PROTOCOL_UNENCRYPED_JABBER);
+				       NDPI_PROTOCOL_UNENCRYPTED_JABBER);
       }
     }
     return;
@@ -129,23 +129,23 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 
 
   /* this part parses a packet and searches for port=. it works asymmetrically. */
-  if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNENCRYPED_JABBER) {
+  if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNENCRYPTED_JABBER) {
     u_int16_t lastlen;
     u_int16_t j_port = 0;
     /* check for google jabber voip connections ... */
     /* need big packet */
     if (packet->payload_packet_len < 100) {
-      NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "packet too small, return.\n");
+      NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "packet too small, return.\n");
       return;
     }
     /* need message to or type for file-transfer */
     if (memcmp(packet->payload, "<iq from=\"", 8) == 0 || memcmp(packet->payload, "<iq from=\'", 8) == 0) {
-      NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER <iq from=\".\n");
+      NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER <iq from=\".\n");
       lastlen = packet->payload_packet_len - 11;
       for (x = 10; x < lastlen; x++) {
 	if (packet->payload[x] == 'p') {
 	  if (memcmp(&packet->payload[x], "port=", 5) == 0) {
-	    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "port=\n");
+	    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "port=\n");
 	    if (src != NULL) {
 	      src->jabber_stun_or_ft_ts = packet->tick_timestamp;
 	    }
@@ -155,16 +155,16 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 	    }
 	    x += 6;
 	    j_port = ntohs_ndpi_bytestream_to_number(&packet->payload[x], packet->payload_packet_len, &x);
-	    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+	    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 		     NDPI_LOG_DEBUG, "JABBER port : %u\n", ntohs(j_port));
 	    if (src != NULL) {
 	      if (src->jabber_file_transfer_port[0] == 0 || src->jabber_file_transfer_port[0] == j_port) {
-		NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+		NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 			 NDPI_LOG_DEBUG, "src->jabber_file_transfer_port[0] = j_port = %u;\n",
 			 ntohs(j_port));
 		src->jabber_file_transfer_port[0] = j_port;
 	      } else {
-		NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+		NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 			 NDPI_LOG_DEBUG, "src->jabber_file_transfer_port[1] = j_port = %u;\n",
 			 ntohs(j_port));
 		src->jabber_file_transfer_port[1] = j_port;
@@ -172,12 +172,12 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 	    }
 	    if (dst != NULL) {
 	      if (dst->jabber_file_transfer_port[0] == 0 || dst->jabber_file_transfer_port[0] == j_port) {
-		NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+		NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 			 NDPI_LOG_DEBUG, "dst->jabber_file_transfer_port[0] = j_port = %u;\n",
 			 ntohs(j_port));
 		dst->jabber_file_transfer_port[0] = j_port;
 	      } else {
-		NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+		NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 			 NDPI_LOG_DEBUG, "dst->jabber_file_transfer_port[1] = j_port = %u;\n",
 			 ntohs(j_port));
 		dst->jabber_file_transfer_port[1] = j_port;
@@ -191,7 +191,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 
     } else if (memcmp(packet->payload, "<iq to=\"", 8) == 0 || memcmp(packet->payload, "<iq to=\'", 8) == 0
 	       || memcmp(packet->payload, "<iq type=", 9) == 0) {
-      NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER <iq to=\"/type=\"\n");
+      NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER <iq to=\"/type=\"\n");
       lastlen = packet->payload_packet_len - 21;
       for (x = 8; x < lastlen; x++) {
 	/* invalid character */
@@ -199,7 +199,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 	  return;
 	}
 	if (packet->payload[x] == '@') {
-	  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER @\n");
+	  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "JABBER @\n");
 	  break;
 	}
       }
@@ -211,7 +211,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
       for (; x < lastlen; x++) {
 	if (packet->payload[x] == 'p') {
 	  if (memcmp(&packet->payload[x], "port=", 5) == 0) {
-	    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "port=\n");
+	    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "port=\n");
 	    if (src != NULL) {
 	      src->jabber_stun_or_ft_ts = packet->tick_timestamp;
 	    }
@@ -222,7 +222,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 
 	    x += 6;
 	    j_port = ntohs_ndpi_bytestream_to_number(&packet->payload[x], packet->payload_packet_len, &x);
-	    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+	    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 		     NDPI_LOG_DEBUG, "JABBER port : %u\n", ntohs(j_port));
 
 	    if (src != NULL && src->jabber_voice_stun_used_ports < JABBER_MAX_STUN_PORTS - 1) {
@@ -232,11 +232,11 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 	      } else {
 		if (src->jabber_file_transfer_port[0] == 0
 		    || src->jabber_file_transfer_port[0] == j_port) {
-		  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
+		  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
 			   "src->jabber_file_transfer_port[0] = j_port = %u;\n", ntohs(j_port));
 		  src->jabber_file_transfer_port[0] = j_port;
 		} else {
-		  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+		  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 			   NDPI_LOG_DEBUG, "src->jabber_file_transfer_port[1] = j_port = %u;\n",
 			   ntohs(j_port));
 		  src->jabber_file_transfer_port[1] = j_port;
@@ -251,11 +251,11 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 	      } else {
 		if (dst->jabber_file_transfer_port[0] == 0
 		    || dst->jabber_file_transfer_port[0] == j_port) {
-		  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
+		  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG,
 			   "dst->jabber_file_transfer_port[0] = j_port = %u;\n", ntohs(j_port));
 		  dst->jabber_file_transfer_port[0] = j_port;
 		} else {
-		  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+		  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 			   NDPI_LOG_DEBUG, "dst->jabber_file_transfer_port[1] = j_port = %u;\n",
 			   ntohs(j_port));
 		  dst->jabber_file_transfer_port[1] = j_port;
@@ -282,7 +282,7 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
        || ndpi_strnstr((const char *)&packet->payload[13], "xmlns:stream=\"http://etherx.jabber.org/streams\"", start)) {
   
       /* Protocol family */
-      ndpi_int_jabber_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPED_JABBER);
+      ndpi_int_jabber_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPTED_JABBER);
 
       /* search for subprotocols */
       check_content_type_and_change_protocol(ndpi_struct, flow, 13);
@@ -291,13 +291,13 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
   }
   
   if (flow->packet_counter < 3) {
-    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct,
+    NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct,
 	     NDPI_LOG_DEBUG, "packet_counter: %u\n", flow->packet_counter);
     return;
   }
 
-  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_TRACE, "JABBER Excluded.\n");
-  NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_UNENCRYPED_JABBER);
+  NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_TRACE, "JABBER Excluded.\n");
+  NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_UNENCRYPTED_JABBER);
 
 #ifdef NDPI_PROTOCOL_TRUPHONE
   NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_TRUPHONE);
@@ -307,8 +307,8 @@ void ndpi_search_jabber_tcp(struct ndpi_detection_module_struct *ndpi_struct, st
 
 void init_jabber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
 {
-  ndpi_set_bitmask_protocol_detection("Unencryped_Jabber", ndpi_struct, detection_bitmask, *id,
-				      NDPI_PROTOCOL_UNENCRYPED_JABBER,
+  ndpi_set_bitmask_protocol_detection("Unencrypted_Jabber", ndpi_struct, detection_bitmask, *id,
+				      NDPI_PROTOCOL_UNENCRYPTED_JABBER,
 				      ndpi_search_jabber_tcp,
 				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITHOUT_RETRANSMISSION,
 				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
diff --git a/src/lib/protocols/msn.c b/src/lib/protocols/msn.c
index 2f5b6c468..2938d39b8 100644
--- a/src/lib/protocols/msn.c
+++ b/src/lib/protocols/msn.c
@@ -203,7 +203,7 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
 	if(memcmp(&packet->payload[5], "http://", 7) == 0) {
 	  /*
 	   * We are searching for a pattern "POST http://gateway.messenger.hotmail.com/gateway/gateway.dll" or
-	   * "POST http://<some ip addres here like 172.0.0.0>/gateway/gateway.dll"
+	   * "POST http://<some ip address here like 172.0.0.0>/gateway/gateway.dll"
 	   * POST http:// is 12 byte so we are searching for 13 to 70 byte for this paten.
 	   */
 	  for(c = 13; c < 50; c++) {
@@ -373,7 +373,7 @@ static void ndpi_search_msn_tcp(struct ndpi_detection_module_struct *ndpi_struct
       }
     }
   }
-  /* finished examining the secone packet only */
+  /* finished examining the second packet only */
   /* direct user connection (file transfer,...) */
   
   if((src != NULL && NDPI_COMPARE_PROTOCOL_TO_BITMASK(src->detected_protocol_bitmask, NDPI_PROTOCOL_MSN) != 0)
@@ -509,7 +509,7 @@ void ndpi_search_msn(struct ndpi_detection_module_struct *ndpi_struct, struct nd
     /* we deal with tcp now */
     if(packet->tcp != NULL) {
       /* msn can use http or ssl for connection. That's why every http, ssl and ukn packet must enter in the msn detection */
-      /* the detection can swich out the http or the ssl detection. In this case we need not check those protocols */
+      /* the detection can switch out the http or the ssl detection. In this case we need not check those protocols */
       // need to do the ceck when protocol == http too (POST /gateway ...)
       if(packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
 #ifdef NDPI_PROTOCOL_HTTP
diff --git a/src/lib/protocols/rx.c b/src/lib/protocols/rx.c
index e5ae25476..b206ff5aa 100644
--- a/src/lib/protocols/rx.c
+++ b/src/lib/protocols/rx.c
@@ -27,7 +27,7 @@
 
 #ifdef NDPI_PROTOCOL_RX
 
-/* See http://web.mit.edu/kolya/afs/rx/rx-spec for procotol description. */
+/* See http://web.mit.edu/kolya/afs/rx/rx-spec for protocol description. */
 
 /* The should be no need for explicit packing, but just in case... */
 PACK_ON
diff --git a/src/lib/protocols/smpp.c b/src/lib/protocols/smpp.c
index d6d898893..3185cbf44 100644
--- a/src/lib/protocols/smpp.c
+++ b/src/lib/protocols/smpp.c
@@ -31,9 +31,9 @@ static void ndpi_int_smpp_add_connection(struct ndpi_detection_module_struct* nd
   ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SMPP, NDPI_PROTOCOL_UNKNOWN);
 }
 
-static  u_int8_t ndpi_check_overflow(u_int32_t current_legth, u_int32_t total_lenth)
+static  u_int8_t ndpi_check_overflow(u_int32_t current_length, u_int32_t total_lenth)
 {
-    return (current_legth > 0 && current_legth > INT_MAX - total_lenth);
+    return (current_length > 0 && current_length > INT_MAX - total_lenth);
 }
 
 void ndpi_search_smpp_tcp(struct ndpi_detection_module_struct* ndpi_struct, 
@@ -122,7 +122,7 @@ void ndpi_search_smpp_tcp(struct ndpi_detection_module_struct* ndpi_struct,
       switch(pdu_type){
 	// GENERIC_NACK
       case 0x80000000:
-	// body lengh must be zero
+	// body length must be zero
 	if(pdu_l > 16) extra_passed = 0;
 	break;
 
@@ -134,7 +134,7 @@ void ndpi_search_smpp_tcp(struct ndpi_detection_module_struct* ndpi_struct,
       case 0x00000009:
 	// status field must be NULL
 	if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
-	// min body lengh = 10 bytes (+16 in header)
+	// min body length = 10 bytes (+16 in header)
 	if(pdu_l < 26) extra_passed = 0; 
 	break;
 
@@ -160,13 +160,13 @@ void ndpi_search_smpp_tcp(struct ndpi_detection_module_struct* ndpi_struct,
       case 0x00000006:
 	// status field must be NULL
 	if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
-	// body lengh must be zero
+	// body length must be zero
 	if(pdu_l > 16) extra_passed = 0;
 	break;
 
 	// UNBIND_RESP
       case 0x80000006:
-	// body lengh must be zero
+	// body length must be zero
 	if(pdu_l > 16) extra_passed = 0;
 	break;
 
@@ -277,13 +277,13 @@ void ndpi_search_smpp_tcp(struct ndpi_detection_module_struct* ndpi_struct,
       case 0x00000015:
 	// status field must be NULL
 	if(get_u_int32_t(packet->payload, 8) != 0) extra_passed = 0;
-	// body lengh must be zero
+	// body length must be zero
 	if(pdu_l > 16) extra_passed = 0;
 	break;
 
 	// ENQUIRE_LINK_RESP
       case 0x80000015:
-	// body lengh must be zero
+	// body length must be zero
 	if(pdu_l > 16) extra_passed = 0;
 	break;
 
diff --git a/src/lib/protocols/sopcast.c b/src/lib/protocols/sopcast.c
index 64a50542a..63590fec7 100644
--- a/src/lib/protocols/sopcast.c
+++ b/src/lib/protocols/sopcast.c
@@ -144,7 +144,7 @@ static void ndpi_search_sopcast_udp(struct ndpi_detection_module_struct
     ndpi_int_sopcast_add_connection(ndpi_struct, flow);
     return;
   }
-  /* this case has been seen once. Please revome this comment, if you see it another time */
+  /* this case has been seen once. Please remove this comment, if you see it another time */
   if (packet->payload_packet_len == 60 && packet->payload[0] == 0x00
       && packet->payload[2] == 0x01
       && packet->payload[8] == 0x03 && packet->payload[9] == 0xff
@@ -174,7 +174,7 @@ static void ndpi_search_sopcast_udp(struct ndpi_detection_module_struct
     ndpi_int_sopcast_add_connection(ndpi_struct, flow);
     return;
   }
-  /* this case has been seen once. Please revome this comment, if you see it another time */
+  /* this case has been seen once. Please remove this comment, if you see it another time */
   if (packet->payload_packet_len == 286 && packet->payload[0] == 0x00
       && packet->payload[1] == 0x02 && packet->payload[2] == 0x01
       && packet->payload[3] == 0x07 && packet->payload[4] == 0x03
diff --git a/src/lib/protocols/soulseek.c b/src/lib/protocols/soulseek.c
index 2e13edd3a..c7acc3bdc 100644
--- a/src/lib/protocols/soulseek.c
+++ b/src/lib/protocols/soulseek.c
@@ -82,7 +82,7 @@ void ndpi_search_soulseek_tcp(struct ndpi_detection_module_struct *ndpi_struct,
        && ((u_int32_t)(packet->tick_timestamp - dst->soulseek_last_safe_access_time) < ndpi_struct->soulseek_connection_ip_tick_timeout)) {
       
       NDPI_LOG(NDPI_PROTOCOL_SOULSEEK, ndpi_struct, NDPI_LOG_DEBUG,
-	       "Soulseek: Plain detection on Port : %u packet_tick_timestamp: %u soulseeek_last_safe_access_time: %u soulseek_connection_ip_ticktimeout: %u\n",
+	       "Soulseek: Plain detection on Port : %u packet_tick_timestamp: %u soulseek_last_safe_access_time: %u soulseek_connection_ip_ticktimeout: %u\n",
 	       dst->soulseek_listen_port, packet->tick_timestamp, dst->soulseek_last_safe_access_time, ndpi_struct->soulseek_connection_ip_tick_timeout);
       
       dst->soulseek_last_safe_access_time = packet->tick_timestamp;
@@ -100,7 +100,7 @@ void ndpi_search_soulseek_tcp(struct ndpi_detection_module_struct *ndpi_struct,
       if(packet->payload_packet_len >= 12 && packet->payload_packet_len < 300 && get_l32(packet->payload, 4) == 1) {
 	while (!get_u_int16_t(packet->payload, index + 2)
 	       && (index + get_l32(packet->payload, index)) < packet->payload_packet_len - 4) {
-	  if(get_l32(packet->payload, index) < 8)	/*Minimum soulsek  login msg is 8B */
+	  if(get_l32(packet->payload, index) < 8)	/*Minimum soulseek login msg is 8B */
 	    break;
 
 	  if(index + get_l32(packet->payload, index) + 4 <= index) {
diff --git a/src/lib/protocols/ssl.c b/src/lib/protocols/ssl.c
index bc64a6695..ca42adbbe 100644
--- a/src/lib/protocols/ssl.c
+++ b/src/lib/protocols/ssl.c
@@ -363,14 +363,14 @@ static void ssl_mark_and_payload_search_for_other_protocols(struct
 							    ndpi_detection_module_struct
 							    *ndpi_struct, struct ndpi_flow_struct *flow)
 {
-#if defined(NDPI_PROTOCOL_MEEBO)|| defined(NDPI_PROTOCOL_TOR) || defined(NDPI_PROTOCOL_VPN_X) || defined(NDPI_PROTOCOL_UNENCRYPED_JABBER) || defined (NDPI_PROTOCOL_OSCAR) || defined (NDPI_PROTOCOL_ITUNES) || defined (NDPI_PROTOCOL_GMAIL)
+#if defined(NDPI_PROTOCOL_MEEBO)|| defined(NDPI_PROTOCOL_TOR) || defined(NDPI_PROTOCOL_VPN_X) || defined(NDPI_PROTOCOL_UNENCRYPTED_JABBER) || defined (NDPI_PROTOCOL_OSCAR) || defined (NDPI_PROTOCOL_ITUNES) || defined (NDPI_PROTOCOL_GMAIL)
   struct ndpi_packet_struct *packet = &flow->packet;
   //      struct ndpi_id_struct         *src=flow->src;
   //      struct ndpi_id_struct         *dst=flow->dst;
   u_int32_t a;
   u_int32_t end;
-#if defined(NDPI_PROTOCOL_UNENCRYPED_JABBER)
-  if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(ndpi_struct->detection_bitmask, NDPI_PROTOCOL_UNENCRYPED_JABBER) != 0)
+#if defined(NDPI_PROTOCOL_UNENCRYPTED_JABBER)
+  if(NDPI_COMPARE_PROTOCOL_TO_BITMASK(ndpi_struct->detection_bitmask, NDPI_PROTOCOL_UNENCRYPTED_JABBER) != 0)
     goto check_for_ssl_payload;
 #endif
 #if defined(NDPI_PROTOCOL_OSCAR)
@@ -382,13 +382,13 @@ static void ssl_mark_and_payload_search_for_other_protocols(struct
  check_for_ssl_payload:
   end = packet->payload_packet_len - 20;
   for (a = 5; a < end; a++) {
-#ifdef NDPI_PROTOCOL_UNENCRYPED_JABBER
+#ifdef NDPI_PROTOCOL_UNENCRYPTED_JABBER
     if(packet->payload[a] == 't') {
       if(memcmp(&packet->payload[a], "talk.google.com", 15) == 0) {
-	NDPI_LOG(NDPI_PROTOCOL_UNENCRYPED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "ssl jabber packet match\n");
+	NDPI_LOG(NDPI_PROTOCOL_UNENCRYPTED_JABBER, ndpi_struct, NDPI_LOG_DEBUG, "ssl jabber packet match\n");
 	if(NDPI_COMPARE_PROTOCOL_TO_BITMASK
-	   (ndpi_struct->detection_bitmask, NDPI_PROTOCOL_UNENCRYPED_JABBER) != 0) {
-	  ndpi_int_ssl_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPED_JABBER);
+	   (ndpi_struct->detection_bitmask, NDPI_PROTOCOL_UNENCRYPTED_JABBER) != 0) {
+	  ndpi_int_ssl_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_UNENCRYPTED_JABBER);
 	  return;
 	}
       }
diff --git a/src/lib/protocols/tor.c b/src/lib/protocols/tor.c
index c9ab55542..f6987ef19 100644
--- a/src/lib/protocols/tor.c
+++ b/src/lib/protocols/tor.c
@@ -69,7 +69,7 @@ int ndpi_is_ssl_tor(struct ndpi_detection_module_struct *ndpi_struct,
       ndpi_int_tor_add_connection(ndpi_struct, flow);
       return(1);
     } else {
-#ifdef PENDANTIC_TOR_CHECK
+#ifdef PEDANTIC_TOR_CHECK
       if(gethostbyname(certificate) == NULL) {
 	ndpi_int_tor_add_connection(ndpi_struct, flow);
 	return(1);
diff --git a/src/lib/protocols/zattoo.c b/src/lib/protocols/zattoo.c
index 41d369cf7..3b6adcec8 100644
--- a/src/lib/protocols/zattoo.c
+++ b/src/lib/protocols/zattoo.c
@@ -230,7 +230,7 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct
     }
     
     NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG,
-	     "ZATTOO: discarted the flow (TCP): packet_size: %u; Flowstage: %u\n",
+	     "ZATTOO: discarded the flow (TCP): packet_size: %u; Flowstage: %u\n",
 	     packet->payload_packet_len, flow->zattoo_stage);
 
   }
diff --git a/src/lib/third_party/include/ndpi_patricia.h b/src/lib/third_party/include/ndpi_patricia.h
index 3053cf9e1..bb1806877 100644
--- a/src/lib/third_party/include/ndpi_patricia.h
+++ b/src/lib/third_party/include/ndpi_patricia.h
@@ -236,7 +236,7 @@ MRT Credits
    originally written by him.
 
    Alexey Kuznetsov made enhancements to 1.4.3a and fixed the Linux
-   kernel intarface. Linux's netlink interface was written, referring to
+   kernel interface. Linux's netlink interface was written, referring to
    his code "iproute2".
 
    We would also like to thank our other colleagues in Japan, Portugal,
diff --git a/src/lib/third_party/src/ndpi_patricia.c b/src/lib/third_party/src/ndpi_patricia.c
index c9c052314..13ed71371 100644
--- a/src/lib/third_party/src/ndpi_patricia.c
+++ b/src/lib/third_party/src/ndpi_patricia.c
@@ -84,7 +84,7 @@ int ndpi_comp_with_mask (void *addr, void *dest, u_int mask) {
   return (0);
 }
 
-/* this allows imcomplete prefix */
+/* this allows incomplete prefix */
 int
 ndpi_my_inet_pton (int af, const char *src, void *dst)
 {
@@ -874,7 +874,7 @@ ndpi_patricia_remove (patricia_tree_t *patricia, patricia_node_t *node)
 #endif /* PATRICIA_DEBUG */
 	
     /* this might be a placeholder node -- have to check and make sure
-     * there is a prefix aossciated with it ! */
+     * there is a prefix associated with it ! */
     if(node->prefix != NULL) 
       ndpi_Deref_Prefix (node->prefix);
     node->prefix = NULL;