Browse code

- received contains an ipv6 address and not an ipv6 reference (thanks to Stefan)

Andrei Pelinescu-Onciul authored on 06/06/2003 11:29:35
Showing 3 changed files
... ...
@@ -37,7 +37,7 @@ export makefile_defs
37 37
 VERSION = 0
38 38
 PATCHLEVEL = 8
39 39
 SUBLEVEL =   11
40
-EXTRAVERSION = pre29
40
+EXTRAVERSION = pre30
41 41
 
42 42
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
43 43
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
... ...
@@ -4,7 +4,7 @@ $Id$
4 4
 
5 5
 release:
6 6
 - fix CC_VER bug in newer Makefile (move DEFS after CC?)
7
-- openbsd 3.2 packages -> doc in share/doc (and not in doc)
7
+x openbsd 3.2 packages -> doc in share/doc (and not in doc)
8 8
 - openbsd 3.2 -> add jabber and mysql to the package
9 9
 x fix modules makefiles (so that cd modules/foo; make will also link the proper
10 10
    libs)
... ...
@@ -279,9 +279,7 @@ char* received_builder(struct sip_msg *msg, unsigned int *received_len)
279 279
 	struct ip_addr *source_ip;
280 280
 	char *tmp;
281 281
 	int  tmp_len;
282
-	int extra_len;
283 282
 
284
-	extra_len = 0;
285 283
 	source_ip=&msg->rcv.src_ip;
286 284
 
287 285
 	buf=pkg_malloc(sizeof(char)*MAX_RECEIVED_SIZE);
... ...
@@ -295,14 +293,8 @@ char* received_builder(struct sip_msg *msg, unsigned int *received_len)
295 295
 		return 0; /* error*/
296 296
 	tmp_len=strlen(tmp);
297 297
 	len=RECEIVED_LEN+tmp_len;
298
-	if(source_ip->af==AF_INET6){
299
-		len+=2;
300
-		buf[RECEIVED_LEN]='[';
301
-		buf[RECEIVED_LEN+tmp_len+1]=']';
302
-		extra_len=1;
303
-	}
304 298
 	
305
-	memcpy(buf+RECEIVED_LEN+extra_len, tmp, tmp_len);
299
+	memcpy(buf+RECEIVED_LEN, tmp, tmp_len);
306 300
 	buf[len]=0; /*null terminate it */
307 301
 
308 302
 	*received_len = len;