deleted file mode 100644

@@ -1,110 +0,0 @@

-/*

- *

- * Copyright (C) 2001-2003 FhG Fokus

- *

- * This file is part of Kamailio, a free SIP server.

- *

- * Kamailio is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version

- *

- * Kamailio is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License 

- * along with this program; if not, write to the Free Software 

- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

- */

-/*!

-* \file

-* \brief Kamailio core :: Name/alias handling

-* \author andrei

-* \ingroup core

-* Module: \ref core

-*/

-

-

-

-#include "str.h"

-#include "dprint.h"

-#include "mem/mem.h"

-

-

-

-struct host_alias{

-	str alias;

-	unsigned short port;

-	unsigned short proto;

-	struct host_alias* next;

-};

-

-

-extern struct host_alias* aliases;

-

-

-

-/** returns 1 if  name is in the alias list; if port=0, port no is ignored

- * if proto=0, proto is ignored*/

-static inline int grep_aliases(char* name, int len, unsigned short port,

-								unsigned short proto)

-{

-	struct  host_alias* a;

-	

-	if ((len>2)&&((*name)=='[')&&(name[len-1]==']')){

-		/* ipv6 reference, skip [] */

-		name++;

-		len-=2;

-	}

-	for(a=aliases;a;a=a->next)

-		if ((a->alias.len==len) && ((a->port==0) || (port==0) || 

-				(a->port==port)) && ((a->proto==0) || (proto==0) || 

-				(a->proto==proto)) && (strncasecmp(a->alias.s, name, len)==0))

-			return 1;

-	return 0;

-}

-

-

-

-/** adds an alias to the list (only if it isn't already there)

- * if port==0, the alias will match all the ports

- * if proto==0, the alias will match all the protocols

- * returns 1 if a new alias was added, 0 if a matching alias was already on

- * the list and  -1 on error */

-static inline int add_alias(char* name, int len, unsigned short port, 

-								unsigned short proto)

-{

-	struct host_alias* a;

-	

-	if ((port) && (proto)){

-		/* don't add if there is already an alias matching it */

-		if (grep_aliases(name,len, port, proto)) return 0;

-	}else{

-		/* don't add if already in the list with port or proto ==0*/

-		for(a=aliases;a;a=a->next)

-			if ((a->alias.len==len) && (a->port==port) && (a->proto==proto) &&

-					(strncasecmp(a->alias.s, name, len)==0))

-				return 0;

-	}

-	a=(struct host_alias*)pkg_malloc(sizeof(struct host_alias));

-	if(a==0) goto error;

-	a->alias.s=(char*)pkg_malloc(len+1);

-	if (a->alias.s==0) goto error;

-	a->alias.len=len;

-	memcpy(a->alias.s, name, len);

-	a->alias.s[len]=0; /* null terminate for easier printing*/

-	a->port=port;

-	a->proto=proto;

-	a->next=aliases;

-	aliases=a;

-	return 1;

-error:

-	LM_ERR("memory allocation error\n");

-	if (a) pkg_free(a);

-	return -1;

-}

-

-

-

@@ -1,22 +1,15 @@

 /*

- * $Id$

- *

  *

  * Copyright (C) 2001-2003 FhG Fokus

  *

- * This file is part of ser, a free SIP server.

+ * This file is part of Kamailio, a free SIP server.

  *

- * ser is free software; you can redistribute it and/or modify

+ * Kamailio is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

  * the Free Software Foundation; either version 2 of the License, or

  * (at your option) any later version

  *

- * For a license to use the ser software under conditions

- * other than those described here, or to purchase support for this

- * software, please contact iptel.org by e-mail at the following addresses:

- *    info@iptel.org

- *

- * ser is distributed in the hope that it will be useful,

+ * Kamailio is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

@@ -25,12 +18,13 @@

  * along with this program; if not, write to the Free Software 

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

-/*

- * History:

- * --------

- *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)

- *  2003-10-21  support for proto added: proto:host:port (andrei)

- */

+/*!

+* \file

+* \brief Kamailio core :: Name/alias handling

+* \author andrei

+* \ingroup core

+* Module: \ref core

+*/

@@ -52,7 +46,7 @@ extern struct host_alias* aliases;

-/* returns 1 if  name is in the alias list; if port=0, port no is ignored

+/** returns 1 if  name is in the alias list; if port=0, port no is ignored

  * if proto=0, proto is ignored*/

 static inline int grep_aliases(char* name, int len, unsigned short port,

 								unsigned short proto)

@@ -74,7 +68,7 @@ static inline int grep_aliases(char* name, int len, unsigned short port,

-/* adds an alias to the list (only if it isn't already there)

+/** adds an alias to the list (only if it isn't already there)

  * if port==0, the alias will match all the ports

  * if proto==0, the alias will match all the protocols

  * returns 1 if a new alias was added, 0 if a matching alias was already on

@@ -107,7 +107,7 @@ static inline int add_alias(char* name, int len, unsigned short port,

 	aliases=a;

 	return 1;

 error:

-	LOG(L_ERR, "ERROR: add_alias: memory allocation error\n");

+	LM_ERR("memory allocation error\n");

 	if (a) pkg_free(a);

 	return -1;

 }

@@ -23,7 +23,7 @@

  *

  * You should have received a copy of the GNU General Public License 

  * along with this program; if not, write to the Free Software 

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

 /*

  * History:

@@ -59,13 +59,11 @@ static inline int grep_aliases(char* name, int len, unsigned short port,

 {

 	struct  host_alias* a;

-#ifdef USE_IPV6

 	if ((len>2)&&((*name)=='[')&&(name[len-1]==']')){

 		/* ipv6 reference, skip [] */

 		name++;

 		len-=2;

 	}

-#endif

 	for(a=aliases;a;a=a->next)

 		if ((a->alias.len==len) && ((a->port==0) || (port==0) || 

 				(a->port==port)) && ((a->proto==0) || (proto==0) || 

@@ -59,6 +59,13 @@ static inline int grep_aliases(char* name, int len, unsigned short port,

 {

 	struct  host_alias* a;

+#ifdef USE_IPV6

+	if ((len>2)&&((*name)=='[')&&(name[len-1]==']')){

+		/* ipv6 reference, skip [] */

+		name++;

+		len-=2;

+	}

+#endif

 	for(a=aliases;a;a=a->next)

 		if ((a->alias.len==len) && ((a->port==0) || (port==0) || 

 				(a->port==port)) && ((a->proto==0) || (proto==0) || 

@@ -2,7 +2,7 @@

  * $Id$

  *

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -29,6 +29,7 @@

  * History:

  * --------

  *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)

+ *  2003-10-21  support for proto added: proto:host:port (andrei)

  */

@@ -42,6 +43,7 @@

 struct host_alias{

 	str alias;

 	unsigned short port;

+	unsigned short proto;

 	struct host_alias* next;

 };

@@ -50,19 +52,17 @@ extern struct host_alias* aliases;

-/* returns 1 if  name is in the alias list; if port=0, port no is ignored*/

-static inline int grep_aliases(char* name, int len, unsigned short port)

+/* returns 1 if  name is in the alias list; if port=0, port no is ignored

+ * if proto=0, proto is ignored*/

+static inline int grep_aliases(char* name, int len, unsigned short port,

+								unsigned short proto)

 {

 	struct  host_alias* a;

 	for(a=aliases;a;a=a->next)

-#ifdef USE_TLS

 		if ((a->alias.len==len) && ((a->port==0) || (port==0) || 

-					(port==tls_port_no) ||

-#else

-		if ((a->alias.len==len) && ((a->port==0) || (port==0) || 

-#endif

-				(a->port==port)) && (strncasecmp(a->alias.s, name, len)==0))

+				(a->port==port)) && ((a->proto==0) || (proto==0) || 

+				(a->proto==proto)) && (strncasecmp(a->alias.s, name, len)==0))

 			return 1;

 	return 0;

 }

@@ -71,14 +71,24 @@ static inline int grep_aliases(char* name, int len, unsigned short port)

 /* adds an alias to the list (only if it isn't already there)

  * if port==0, the alias will match all the ports

- * returns 1 if a new alias was added, 0 if the alias was already on the list

- * and  -1 on error */

-static inline int add_alias(char* name, int len, unsigned short port)

+ * if proto==0, the alias will match all the protocols

+ * returns 1 if a new alias was added, 0 if a matching alias was already on

+ * the list and  -1 on error */

+static inline int add_alias(char* name, int len, unsigned short port, 

+								unsigned short proto)

 {

 	struct host_alias* a;

-	if ((port) && grep_aliases(name,len, port)) return 0;

-	a=0;

+	if ((port) && (proto)){

+		/* don't add if there is already an alias matching it */

+		if (grep_aliases(name,len, port, proto)) return 0;

+	}else{

+		/* don't add if already in the list with port or proto ==0*/

+		for(a=aliases;a;a=a->next)

+			if ((a->alias.len==len) && (a->port==port) && (a->proto==proto) &&

+					(strncasecmp(a->alias.s, name, len)==0))

+				return 0;

+	}

 	a=(struct host_alias*)pkg_malloc(sizeof(struct host_alias));

 	if(a==0) goto error;

 	a->alias.s=(char*)pkg_malloc(len+1);

@@ -87,6 +97,7 @@ static inline int add_alias(char* name, int len, unsigned short port)

 	memcpy(a->alias.s, name, len);

 	a->alias.s[len]=0; /* null terminate for easier printing*/

 	a->port=port;

+	a->proto=proto;

 	a->next=aliases;

 	aliases=a;

 	return 1;

@@ -57,7 +57,8 @@ static inline int grep_aliases(char* name, int len, unsigned short port)

 	for(a=aliases;a;a=a->next)

 #ifdef USE_TLS

-		if ((a->alias.len==len) && ((a->port==0) || (port==0) || (port==tls_port_no) ||

+		if ((a->alias.len==len) && ((a->port==0) || (port==0) || 

+					(port==tls_port_no) ||

 #else

 		if ((a->alias.len==len) && ((a->port==0) || (port==0) || 

 #endif

@@ -56,7 +56,11 @@ static inline int grep_aliases(char* name, int len, unsigned short port)

 	struct  host_alias* a;

 	for(a=aliases;a;a=a->next)

+#ifdef USE_TLS

+		if ((a->alias.len==len) && ((a->port==0) || (port==0) || (port==tls_port_no) ||

+#else

 		if ((a->alias.len==len) && ((a->port==0) || (port==0) || 

+#endif

 				(a->port==port)) && (strncasecmp(a->alias.s, name, len)==0))

 			return 1;

 	return 0;

@@ -25,11 +25,17 @@

  * along with this program; if not, write to the Free Software 

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  */

+/*

+ * History:

+ * --------

+ *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free (andrei)

+ */

 #include "str.h"

 #include "dprint.h"

+#include "mem/mem.h"

@@ -68,9 +74,9 @@ static inline int add_alias(char* name, int len, unsigned short port)

 	if ((port) && grep_aliases(name,len, port)) return 0;

 	a=0;

-	a=(struct host_alias*)malloc(sizeof(struct host_alias));

+	a=(struct host_alias*)pkg_malloc(sizeof(struct host_alias));

 	if(a==0) goto error;

-	a->alias.s=(char*)malloc(len+1);

+	a->alias.s=(char*)pkg_malloc(len+1);

 	if (a->alias.s==0) goto error;

 	a->alias.len=len;

 	memcpy(a->alias.s, name, len);

@@ -81,7 +87,7 @@ static inline int add_alias(char* name, int len, unsigned short port)

 	return 1;

 error:

 	LOG(L_ERR, "ERROR: add_alias: memory allocation error\n");

-	if (a) free(a);

+	if (a) pkg_free(a);

 	return -1;

 }

@@ -35,6 +35,7 @@

 struct host_alias{

 	str alias;

+	unsigned short port;

 	struct host_alias* next;

 };

@@ -43,13 +44,14 @@ extern struct host_alias* aliases;

-/* returns 1 if  name is in the alias list*/

-static inline int grep_aliases(char* name, int len)

+/* returns 1 if  name is in the alias list; if port=0, port no is ignored*/

+static inline int grep_aliases(char* name, int len, unsigned short port)

 {

 	struct  host_alias* a;

 	for(a=aliases;a;a=a->next)

-		if ((a->alias.len==len) && (strncasecmp(a->alias.s, name, len)==0))

+		if ((a->alias.len==len) && ((a->port==0) || (port==0) || 

+				(a->port==port)) && (strncasecmp(a->alias.s, name, len)==0))

 			return 1;

 	return 0;

 }

@@ -57,13 +59,14 @@ static inline int grep_aliases(char* name, int len)

 /* adds an alias to the list (only if it isn't already there)

+ * if port==0, the alias will match all the ports

  * returns 1 if a new alias was added, 0 if the alias was already on the list

  * and  -1 on error */

-static inline int add_alias(char* name, int len)

+static inline int add_alias(char* name, int len, unsigned short port)

 {

 	struct host_alias* a;

-	if (grep_aliases(name,len)) return 0;

+	if ((port) && grep_aliases(name,len, port)) return 0;

 	a=0;

 	a=(struct host_alias*)malloc(sizeof(struct host_alias));

 	if(a==0) goto error;

@@ -72,6 +75,7 @@ static inline int add_alias(char* name, int len)

 	a->alias.len=len;

 	memcpy(a->alias.s, name, len);

 	a->alias.s[len]=0; /* null terminate for easier printing*/

+	a->port=port;

 	a->next=aliases;

 	aliases=a;

 	return 1;

@@ -1,9 +1,33 @@

 /*

  * $Id$

  *

+ *

+ * Copyright (C) 2001-2003 Fhg Fokus

+ *

+ * This file is part of ser, a free SIP server.

+ *

+ * ser is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version

+ *

+ * For a license to use the ser software under conditions

+ * other than those described here, or to purchase support for this

+ * software, please contact iptel.org by e-mail at the following addresses:

+ *    info@iptel.org

+ *

+ * ser is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License 

+ * along with this program; if not, write to the Free Software 

+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  */

+

 #include "str.h"

 #include "dprint.h"

new file mode 100644

@@ -0,0 +1,61 @@

+/*

+ * $Id$

+ *

+ */

+

+

+#include "str.h"

+#include "dprint.h"

+

+

+

+struct host_alias{

+	str alias;

+	struct host_alias* next;

+};

+

+

+extern struct host_alias* aliases;

+

+

+

+/* returns 1 if  name is in the alias list*/

+static inline int grep_aliases(char* name, int len)

+{

+	struct  host_alias* a;

+	

+	for(a=aliases;a;a=a->next)

+		if ((a->alias.len==len) && (strncasecmp(a->alias.s, name, len)==0))

+			return 1;

+	return 0;

+}

+

+

+

+/* adds an alias to the list (only if it isn't already there)

+ * returns 1 if a new alias was added, 0 if the alias was already on the list

+ * and  -1 on error */

+static inline int add_alias(char* name, int len)

+{

+	struct host_alias* a;

+	

+	if (grep_aliases(name,len)) return 0;

+	a=0;

+	a=(struct host_alias*)malloc(sizeof(struct host_alias));

+	if(a==0) goto error;

+	a->alias.s=(char*)malloc(len+1);

+	if (a->alias.s==0) goto error;

+	a->alias.len=len;

+	memcpy(a->alias.s, name, len);

+	a->alias.s[len]=0; /* null terminate for easier printing*/

+	a->next=aliases;

+	aliases=a;

+	return 1;

+error:

+	LOG(L_ERR, "ERROR: add_alias: memory allocation error\n");

+	if (a) free(a);

+	return -1;

+}

+

+

+