@@ -37,7 +37,7 @@ export makefile_defs

 VERSION = 0

 PATCHLEVEL = 8

 SUBLEVEL =   11

-EXTRAVERSION = pre29

+EXTRAVERSION = pre30

 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")

@@ -4,7 +4,7 @@ $Id$

 release:

 - fix CC_VER bug in newer Makefile (move DEFS after CC?)

-- openbsd 3.2 packages -> doc in share/doc (and not in doc)

+x openbsd 3.2 packages -> doc in share/doc (and not in doc)

 - openbsd 3.2 -> add jabber and mysql to the package

 x fix modules makefiles (so that cd modules/foo; make will also link the proper

    libs)

@@ -279,9 +279,7 @@ char* received_builder(struct sip_msg *msg, unsigned int *received_len)

 	struct ip_addr *source_ip;

 	char *tmp;

 	int  tmp_len;

-	int extra_len;

-	extra_len = 0;

 	source_ip=&msg->rcv.src_ip;

 	buf=pkg_malloc(sizeof(char)*MAX_RECEIVED_SIZE);

@@ -295,14 +293,8 @@ char* received_builder(struct sip_msg *msg, unsigned int *received_len)

 		return 0; /* error*/

 	tmp_len=strlen(tmp);

 	len=RECEIVED_LEN+tmp_len;

-	if(source_ip->af==AF_INET6){

-		len+=2;

-		buf[RECEIVED_LEN]='[';

-		buf[RECEIVED_LEN+tmp_len+1]=']';

-		extra_len=1;

-	}

-	memcpy(buf+RECEIVED_LEN+extra_len, tmp, tmp_len);

+	memcpy(buf+RECEIVED_LEN, tmp, tmp_len);

 	buf[len]=0; /*null terminate it */

 	*received_len = len;