[sr-dev] git:master: core: fix missing close() in get_out_socket()

[Andrei Pelinescu-Onciul]

Module: sip-router
Branch: master
Commit: ced07a1fe1ce07c13aff2d65b303fa7bba04f6d5
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ced07a1fe1ce07c13aff2d65b303fa7bba04f6d5

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Tue Feb  2 10:09:15 2010 +0100

core: fix missing close() in get_out_socket()

- errorpath for EISCONN missed close()-ing the sockets
- added unlikely() on all the error checks

---

 forward.c |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/forward.c b/forward.c
index 2e6f05e..17094dd 100644
--- a/forward.c
+++ b/forward.c
@@ -129,14 +129,14 @@ struct socket_info* get_out_socket(union sockaddr_union* to, int proto)
 	struct socket_info* si;
 	struct ip_addr ip;
 
-	if (proto!=PROTO_UDP) {
+	if (unlikely(proto!=PROTO_UDP)) {
 		LOG(L_CRIT, "BUG: get_out_socket can only be called for UDP\n");
 		return 0;
 	}
 retry:
 	switch(to->s.sa_family){
 	case AF_INET : {
-		if(sock_inet < 0){
+		if(unlikely(sock_inet < 0)){
 			sock_inet = socket(AF_INET, SOCK_DGRAM, 0);
 			if (sock_inet==-1) {
 				LM_ERR("socket() failed: %s\n", strerror(errno));
@@ -148,7 +148,7 @@ retry:
 	}
 #ifdef USE_IPV6
 	case AF_INET6 : {
-		if(sock_inet6 < 0){
+		if(unlikely(sock_inet6 < 0)){
 			sock_inet6 = socket(AF_INET6, SOCK_DGRAM, 0);
 			if (sock_inet6==-1) {
 				LM_ERR("socket() failed: %s\n", strerror(errno));
@@ -164,13 +164,19 @@ retry:
 		return 0;
 	}
 	}
-	if (connect(*temp_sock, &to->s, sockaddru_len(*to))==-1) {
-		if (errno==EISCONN && !mhomed_sock_cache_disabled){
+	if (unlikely(connect(*temp_sock, &to->s, sockaddru_len(*to))==-1)) {
+		if (unlikely(errno==EISCONN && !mhomed_sock_cache_disabled)){
 			/*  no multiple connects support on the same socket */
 			mhomed_sock_cache_disabled=1;
-			sock_inet=-1;
+			if (sock_inet>=0){
+				close(sock_inet);
+				sock_inet=-1;
+			}
 #ifdef USE_IPV6
-			sock_inet6=-1;
+			if (sock_inet>=0){
+				close(sock_inet6);
+				sock_inet6=-1;
+			}
 #endif /* USE_IPV6 */
 			goto retry;
 		}
@@ -179,7 +185,7 @@ retry:
 		goto error;
 	}
 	len=sizeof(from);
-	if (getsockname(*temp_sock, &from.s, &len)==-1) {
+	if (unlikely(getsockname(*temp_sock, &from.s, &len)==-1)) {
 		LOG(L_ERR, "ERROR: get_out_socket: getsockname failed: %s\n",
 				strerror(errno));
 		goto error;
@@ -195,7 +201,7 @@ retry:
 	return si;
 error:
 	LOG(L_ERR, "ERROR: get_out_socket: no socket found\n");
-	if (unlikely(*temp_sock >=0 && mhomed_sock_cache_disabled)){
+	if (unlikely(mhomed_sock_cache_disabled && *temp_sock >=0)){
 		close(*temp_sock);
 		*temp_sock=-1;
 	}