浏览代码

reverted Bogdan's improvements

Jiri Kuthan 23 年之前
父节点
当前提交
bea9a486c3
共有 1 个文件被更改,包括 4 次插入15 次删除
  1. 4 15
      forward.c

+ 4 - 15
forward.c

@@ -135,8 +135,7 @@ int update_sock_struct_from_via( union sockaddr_union* to,
 								 struct via_body* via )
 {
 	struct hostent* he;
-	//char *host_copy;
-	char backup;
+	char *host_copy;
 
 
 #ifdef DNS_IP_HACK
@@ -158,27 +157,17 @@ int update_sock_struct_from_via( union sockaddr_union* to,
            BTW: when is via->host.s non null terminated? tm copy?
 		   - andrei 
 			Yes -- it happened on generating a 408 by TM; -jiri
-		   if you consider that via is never placed to the end of
-		   the msg buffer (so we can happily work with via->host.s[len]),
-		   insted of making a copy, we can simply backup the first caracter
-		   after via and put a 0 there -> call resolvehost -> restore it
-		   - bogdan
 		*/
 		if (via->host.s[via->host.len]){
-			/*host_copy = pkg_malloc( via->host.len+1 );
+			host_copy=pkg_malloc( via->host.len+1 );
 			if (!host_copy) {
-				LOG(L_NOTICE, "ERROR: update_sock_struct_from_via:"
-					" not enough memory\n");
+				LOG(L_NOTICE, "ERROR: update_sock_struct_from_via: not enough memory\n");
 				return -1;
 			}
 			memcpy(host_copy, via->host.s, via->host.len );
 			host_copy[via->host.len]=0;
 			he=resolvehost(host_copy);
-			pkg_free( host_copy );*/
-			backup = via->host.s[via->host.len];
-			via->host.s[via->host.len] = 0;
-			he=resolvehost(via->host.s);
-			via->host.s[via->host.len] = backup;
+			pkg_free( host_copy );
 		}else{
 			he=resolvehost(via->host.s);
 		}