Browse code

- minor tcp BUG case fix/cleanup

Andrei Pelinescu-Onciul authored on 25/08/2003 12:19:52
Showing 3 changed files
... ...
@@ -2,11 +2,12 @@ $Id$
2 2
 
3 3
 ( - todo, x - done)
4 4
 
5
+x tcp_main_loop: BUG cases should "conitnue;"
5 6
 - change len_gt into and expr (e.g msg:len).
6 7
 - sipit: uri == myself doesn't match tls port = 5061
7 8
 - sipit: fix check_self & *_alias to work with tcp & tls
8 9
 x sipit: fix ipv6 references in check_self
9
-- regex subst on uris?
10
+x regex subst on uris?
10 11
 x port receive.c pre_script_cb fix from stable
11 12
 - extend alias to include port numbers :
12 13
     something like alias= foo1.bar:5080 foo2.bar foo3.bar:*
... ...
@@ -14,12 +15,12 @@ x port receive.c pre_script_cb fix from stable
14 14
        tcp foo.bar:5063, udp foo.bar:5062, foo2.bar
15 15
 
16 16
 release:
17
-- backport: tcp conn id fix to stable + destroy_tcp 
18
-- backport: acc mem. leak fixes
19
-- backport: dns mem. leak fixes (resolve.[ch])
20
-- backport: id_builder receive_msg mem. leak (receive.c)
21
-- backport: check_self ipv6/case fixes (forward.c)
22
-- change tcp timeouts to 2 or 3 min?
17
+x backport: tcp conn id fix to stable + destroy_tcp 
18
+x backport: acc mem. leak fixes
19
+x backport: dns mem. leak fixes (resolve.[ch])
20
+x backport: id_builder receive_msg mem. leak (msg_translator.c)
21
+x backport: check_self ipv6/case fixes (forward.c)
22
+x change tcp timeouts to 2 or 3 min?
23 23
 x check via ipv6 fixes and backport to stable
24 24
 x fix kill(0, SIGTERM) on startup error (will kill also the launching shell
25 25
  if non-interactive)
... ...
@@ -530,7 +530,7 @@ struct hostent* sip_resolvehost(str* name, unsigned short* port, int proto)
530 530
 				}
531 531
 			}
532 532
 			if (head) free_rdata_list(head); /*clean up*/
533
-			DBG("sip_resolvehost: not SRV record found for %.*s," 
533
+			DBG("sip_resolvehost: no SRV record found for %.*s," 
534 534
 					" trying 'normal' lookup...\n", name->len, name->s);
535 535
 		}
536 536
 	}
... ...
@@ -815,13 +815,15 @@ read_again:
815 815
 					LOG(L_CRIT, "BUG: tcp_main_loop: dead child %d\n", r);
816 816
 					/* don't listen on it any more */
817 817
 					FD_CLR(pt[r].unix_sock, &master_set);
818
-					/*exit(-1)*/;
818
+					/*exit(-1);*/
819
+					continue;
819 820
 				}else if (bytes<0){
820 821
 					if (errno==EINTR) goto read_again;
821 822
 					else{
822 823
 						LOG(L_CRIT, "ERROR: tcp_main_loop: read from child: "
823 824
 								" %s\n", strerror(errno));
824 825
 						/* try to continue ? */
826
+						continue;
825 827
 					}
826 828
 				}
827 829