Browse code

- minor tls typo fix

Andrei Pelinescu-Onciul authored on 27/10/2003 16:47:01
Showing 3 changed files
... ...
@@ -11,7 +11,11 @@ texops:
11 11
  - subst('s/re/repl/flags') support
12 12
 core:
13 13
  - added switch to check the config file (-c)
14
- - changes: removed len_gt() and replaced with if (msg:len op number|max_len)
14
+ - changes: 
15
+       removed len_gt() and replaced with if (msg:len op number|max_len)
16
+       protocol and port can be specified in the alias and listen lines, e.g.:
17
+        alias= tcp:foo.bar:* udp:test.bar:5080 foo.com
18
+        listen= eth0   tcp:eth0:5065 udp:127.0.0.1 [3ffe::1]
15 19
  - multiple operator support: ==, != for special operations (e.g myself, ip)
16 20
                               ==, !=, ~= for strings
17 21
                               ==, !=, >, <, >=, <= for integers
... ...
@@ -759,11 +759,6 @@ int main_loop()
759 759
 #ifdef USE_TCP
760 760
 	int sockfd[2];
761 761
 #endif
762
-#ifdef USE_TLS
763
-	char* tmp;
764
-	int len;
765
-#endif
766
-		
767 762
 
768 763
 	/* one "main" process and n children handling i/o */
769 764
 
... ...
@@ -562,7 +562,7 @@ int tcp_init(struct socket_info* sock_info)
562 562
 #endif
563 563
 	
564 564
 	addr=&sock_info->su;
565
-	sock_info->proto=PROTO_TCP;
565
+	/* sock_info->proto=PROTO_TCP; */
566 566
 	if (init_su(addr, &sock_info->address, sock_info->port_no)<0){
567 567
 		LOG(L_ERR, "ERROR: tcp_init: could no init sockaddr_union\n");
568 568
 		goto error;
... ...
@@ -750,7 +750,9 @@ void tcp_main_loop()
750 750
 				FD_SET(si->socket, &master_set);
751 751
 				if (si->socket>maxfd) maxfd=si->socket;
752 752
 			}else{
753
-			LOG(L_CRIT, "BUG: tcp_main_loop: non tls address in tls_listen\n");
753
+				LOG(L_CRIT, "BUG: tcp_main_loop: non tls address"
754
+						" in tls_listen\n");
755
+			}
754 756
 		}
755 757
 	}
756 758
 #endif