[Pkg-voip-commits] r10154 - in /kamailio/trunk/debian: ./ patches/ patches/upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Tue May 7 16:17:23 UTC 2013
Author: maniac-guest
Date: Tue May 7 16:17:22 2013
New Revision: 10154
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10154
Log:
Added upstream fixes
Added:
kamailio/trunk/debian/patches/upstream/0001-db_mysql-add-cast-to-remove-compile-warning.patch
kamailio/trunk/debian/patches/upstream/0002-modules-rls-added-support-for-escaped-chars-in-rls-s.patch
kamailio/trunk/debian/patches/upstream/0003-dns_cache.c-fix-compiler-warnings.patch
kamailio/trunk/debian/patches/upstream/0004-seas-fix-compiler-warning.patch
kamailio/trunk/debian/patches/upstream/0005-seas-fix-compiler-warning.patch
kamailio/trunk/debian/patches/upstream/0006-seas-fix-compiler-warning.patch
kamailio/trunk/debian/patches/upstream/0007-seas-fix-compiler-warning.patch
kamailio/trunk/debian/patches/upstream/0008-seas-fix-compiler-warning-Wunused-but-set-variable.patch
kamailio/trunk/debian/patches/upstream/0009-seas-fix-compiler-warning-Wunused-but-set-variable.patch
kamailio/trunk/debian/patches/upstream/0010-seas-fix-compiler-warning-Wunused-but-set-variable.patch
kamailio/trunk/debian/patches/upstream/0011-seas-fix-warning-Wunused-result.patch
kamailio/trunk/debian/patches/upstream/0012-auth_diameter-remove-unused-but-set-variable.patch
kamailio/trunk/debian/patches/upstream/0013-auth_diameter-remove-unused-but-set-variable.patch
Modified:
kamailio/trunk/debian/changelog
kamailio/trunk/debian/patches/series
Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=10154&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Tue May 7 16:17:22 2013
@@ -3,6 +3,8 @@
* debian/rules:
- change depends for build-arch and build-indep rules
to build-stamp (Closes: #707038)
+ * debian/patches/upstream:
+ - added upstream fixes.
-- Victor Seva <linuxmaniac at torreviejawireless.org> Tue, 07 May 2013 10:04:46 +0200
Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=10154&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Tue May 7 16:17:22 2013
@@ -1,3 +1,16 @@
+upstream/0001-db_mysql-add-cast-to-remove-compile-warning.patch
+upstream/0002-modules-rls-added-support-for-escaped-chars-in-rls-s.patch
+upstream/0003-dns_cache.c-fix-compiler-warnings.patch
+upstream/0004-seas-fix-compiler-warning.patch
+upstream/0005-seas-fix-compiler-warning.patch
+upstream/0006-seas-fix-compiler-warning.patch
+upstream/0007-seas-fix-compiler-warning.patch
+upstream/0008-seas-fix-compiler-warning-Wunused-but-set-variable.patch
+upstream/0009-seas-fix-compiler-warning-Wunused-but-set-variable.patch
+upstream/0010-seas-fix-compiler-warning-Wunused-but-set-variable.patch
+upstream/0011-seas-fix-warning-Wunused-result.patch
+upstream/0012-auth_diameter-remove-unused-but-set-variable.patch
+upstream/0013-auth_diameter-remove-unused-but-set-variable.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
fix_export.patch
Added: kamailio/trunk/debian/patches/upstream/0001-db_mysql-add-cast-to-remove-compile-warning.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0001-db_mysql-add-cast-to-remove-compile-warning.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0001-db_mysql-add-cast-to-remove-compile-warning.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0001-db_mysql-add-cast-to-remove-compile-warning.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,25 @@
+From 19bcbfcacbc442488e93f8c684fd815323d3fcf7 Mon Sep 17 00:00:00 2001
+From: Richard Fuchs <rfuchs at sipwise.com>
+Date: Mon, 29 Apr 2013 11:26:18 -0400
+Subject: [PATCH] db_mysql: add cast to remove compile warning
+
+---
+ modules/db_mysql/km_db_mysql.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c
+index 462dc60..252b499 100644
+--- a/modules/db_mysql/km_db_mysql.c
++++ b/modules/db_mysql/km_db_mysql.c
+@@ -106,7 +106,7 @@ int db_mysql_bind_api(db_func_t *dbb)
+ dbb->query = db_mysql_query;
+ dbb->fetch_result = db_mysql_fetch_result;
+ dbb->raw_query = db_mysql_raw_query;
+- dbb->free_result = db_mysql_free_result;
++ dbb->free_result = (db_free_result_f) db_mysql_free_result;
+ dbb->insert = db_mysql_insert;
+ dbb->delete = db_mysql_delete;
+ dbb->update = db_mysql_update;
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0002-modules-rls-added-support-for-escaped-chars-in-rls-s.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0002-modules-rls-added-support-for-escaped-chars-in-rls-s.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0002-modules-rls-added-support-for-escaped-chars-in-rls-s.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0002-modules-rls-added-support-for-escaped-chars-in-rls-s.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,324 @@
+From e7a8752ad427f8f23df25edc6bd2e7ba531ac6c4 Mon Sep 17 00:00:00 2001
+From: Juha Heinanen <jh at tutpro.com>
+Date: Fri, 3 May 2013 19:53:12 +0300
+Subject: [PATCH] modules/rls: added support for escaped chars in rls-services
+ document (cherry picked from commit
+ fa9b8664a3b7c7a035c738a37b8ef0ef44190cb8)
+
+---
+ modules/rls/notify.c | 61 +++++++++++++++++++++++++----------------------
+ modules/rls/subscribe.c | 46 +++++++++++++++++++++++++++--------
+ modules/rls/utils.c | 54 +++++++++++++++++++++++++++++++++++++++++
+ modules/rls/utils.h | 31 ++++++++++++++++++++++++
+ 4 files changed, 153 insertions(+), 39 deletions(-)
+ create mode 100644 modules/rls/utils.c
+ create mode 100644 modules/rls/utils.h
+
+diff --git a/modules/rls/notify.c b/modules/rls/notify.c
+index f0ec0aa..7b5bec3 100644
+--- a/modules/rls/notify.c
++++ b/modules/rls/notify.c
+@@ -48,6 +48,7 @@
+ #include "../../hashes.h"
+ #include "rls.h"
+ #include "notify.h"
++#include "utils.h"
+ #include <libxml/xpath.h>
+ #include <libxml/xpathInternals.h>
+
+@@ -1003,7 +1004,7 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain,
+ list_func_t function, void* param)
+ {
+ xmlNodePtr node;
+- char* uri = NULL;
++ str uri;
+ int res = 0;
+
+ for(node= list_node->children; node; node= node->next)
+@@ -1014,16 +1015,33 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain,
+ unsigned short port = 0;
+ xmlNodePtr rl_node = NULL;
+ xmlDocPtr rl_doc = NULL;
++ str unescaped_uri;
++ char buf[MAX_URI_SIZE];
++
+
+- uri= XMLNodeGetNodeContentByName(node, "resource-list", NULL);
+-
+- if (uri == NULL)
++ uri.s = XMLNodeGetNodeContentByName(node, "resource-list", NULL);
++ if (uri.s == NULL)
+ {
+ LM_ERR("when extracting URI from node\n");
+ return -1;
+ }
++ uri.len = strlen(uri.s);
++ if (uri.len > MAX_URI_SIZE-1) {
++ LM_ERR("XCAP URI is too long\n");
++ return -1;
++ }
++ LM_DBG("got resource-list uri <%.*s>\n", uri.len, uri.s);
++
++ unescaped_uri.s = buf;
++ unescaped_uri.len = 0;
++ if (un_escape(&uri, &unescaped_uri) < 0) {
++ LM_ERR("Error un-escaping XCAP URI\n");
++ return -1;
++ }
++ unescaped_uri.s[unescaped_uri.len] = 0;
++ LM_DBG("got unescaped uri <%s>\n", unescaped_uri.s);
+
+- if(parse_xcap_uri(uri, &hostname, &port, &rl_uri)>0)
++ if(parse_xcap_uri(unescaped_uri.s, &hostname, &port, &rl_uri)>0)
+ {
+ if (rls_integrated_xcap_server == 1
+ && (hostname.len == 0
+@@ -1034,13 +1052,13 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain,
+ {
+ LM_DBG("calling myself for rl_node\n");
+ res = process_list_and_exec(rl_node, username, domain, function, param);
+- xmlFree(uri);
++ xmlFree(uri.s);
+ xmlFreeDoc(rl_doc);
+ }
+ else
+ {
+ LM_ERR("<resource-list/> not found\n");
+- xmlFree(uri);
++ xmlFree(uri.s);
+ return -1;
+ }
+
+@@ -1048,7 +1066,7 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain,
+ else
+ {
+ LM_ERR("<resource-list/> is not local - unsupported at this time\n");
+- xmlFree(uri);
++ xmlFree(uri.s);
+ return -1;
+ }
+ }
+@@ -1061,20 +1079,20 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain,
+ else
+ if(xmlStrcasecmp(node->name,(unsigned char*)"entry")== 0)
+ {
+- uri= XMLNodeGetAttrContentByName(node, "uri");
+- if(uri== NULL)
++ uri.s = XMLNodeGetAttrContentByName(node, "uri");
++ if(uri.s== NULL)
+ {
+ LM_ERR("when extracting entry uri attribute\n");
+ return -1;
+ }
+- LM_DBG("uri= %s\n", uri);
+- if(function(uri, param)< 0)
++ LM_DBG("uri= %s\n", uri.s);
++ if(function(uri.s, param)< 0)
+ {
+ LM_ERR("in function given as a parameter\n");
+- xmlFree(uri);
++ xmlFree(uri.s);
+ return -1;
+ }
+- xmlFree(uri);
++ xmlFree(uri.s);
+ }
+ else
+ if(xmlStrcasecmp(node->name,(unsigned char*)"list")== 0)
+@@ -1253,21 +1271,6 @@ int rls_get_resource_list(str *rl_uri, str *username, str *domain,
+ path.len += 7;
+ checked++;
+ }
+- else if (checked <= rl_uri->len - 3 && strncmp(rl_uri->s + checked, "\%5b", 3) == 0)
+- {
+- path.s[path.len++] = '[';
+- checked += 3;
+- }
+- else if (checked <= rl_uri->len - 3 && strncmp(rl_uri->s + checked, "\%5d", 3) == 0)
+- {
+- path.s[path.len++] = ']';
+- checked += 3;
+- }
+- else if (checked <= rl_uri->len - 3 && strncmp(rl_uri->s + checked, "\%22", 3) == 0)
+- {
+- path.s[path.len++] = '\"';
+- checked += 3;
+- }
+ else
+ {
+ path.s[path.len++] = rl_uri->s[checked];
+diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c
+index e022c43..5ebd739 100644
+--- a/modules/rls/subscribe.c
++++ b/modules/rls/subscribe.c
+@@ -51,6 +51,7 @@
+ #include "rls.h"
+ #include "../../mod_fix.h"
+ #include "list.h"
++#include "utils.h"
+
+ int counter= 0;
+
+@@ -72,10 +73,12 @@ int remove_expired_rlsubs( subs_t* subs,unsigned int hash_code);
+ /**
+ * return the XML node for rls-services matching uri
+ */
+-xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* uri)
++xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* service_uri)
+ {
+ xmlNodePtr root, node;
+- char* val;
++ struct sip_uri sip_uri;
++ str uri, uri_str;
++ str *normalized_uri;
+
+ root = XMLDocGetNodeByName(doc, "rls-services", NULL);
+ if(root==NULL)
+@@ -88,16 +91,39 @@ xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* uri)
+ {
+ if(xmlStrcasecmp(node->name, (unsigned char*)"service")==0)
+ {
+- val = XMLNodeGetAttrContentByName(node, "uri");
+- if(val!=NULL)
++ uri.s = XMLNodeGetAttrContentByName(node, "uri");
++ if (uri.s == NULL)
+ {
+- if((uri->len==strlen(val)) && (strncmp(val, uri->s, uri->len)==0))
+- {
+- xmlFree(val);
+- return node;
+- }
+- xmlFree(val);
++ LM_DBG("failed to fetch 'uri' in service [invalid XML from XCAP]\n");
++ continue;
++ }
++ uri.len = strlen(uri.s);
++ normalized_uri = normalize_sip_uri(&uri);
++ if (normalized_uri->s == NULL || normalized_uri->len == 0)
++ {
++ LM_ERR("failed to normalize service URI\n");
++ xmlFree(uri.s);
++ return NULL;
++ }
++ xmlFree(uri.s);
++ if(parse_uri(normalized_uri->s, normalized_uri->len, &sip_uri)< 0)
++ {
++ LM_ERR("failed to parse uri\n");
++ return NULL;
++ }
++ if(uandd_to_uri(sip_uri.user, sip_uri.host, &uri_str)< 0)
++ {
++ LM_ERR("failed to construct uri from user and domain\n");
++ return NULL;
++ }
++ if(uri_str.len== service_uri->len &&
++ strncmp(uri_str.s, service_uri->s, uri_str.len) == 0)
++ {
++ pkg_free(uri_str.s);
++ return node;
+ }
++ LM_DBG("match not found, service-uri = [%.*s]\n", uri_str.len, uri_str.s);
++ pkg_free(uri_str.s);
+ }
+ }
+ return NULL;
+diff --git a/modules/rls/utils.c b/modules/rls/utils.c
+new file mode 100644
+index 0000000..161529c
+--- /dev/null
++++ b/modules/rls/utils.c
+@@ -0,0 +1,54 @@
++/*
++ * rls module - resource list server
++ *
++ * Copyright (C) 2012 AG Projects
++ *
++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#include "../../ut.h"
++
++#define SIP_PREFIX "sip:"
++#define SIP_PREFIX_LEN sizeof(SIP_PREFIX)-1
++
++str* normalize_sip_uri(const str *uri)
++{
++ static str normalized_uri;
++ static str null_str = {NULL, 0};
++ static char buf[MAX_URI_SIZE];
++
++ normalized_uri.s = buf;
++ if (un_escape((str *)uri, &normalized_uri) < 0)
++ {
++ LM_ERR("un-escaping URI\n");
++ return &null_str;
++ }
++
++ normalized_uri.s[normalized_uri.len] = '\0';
++ if (strncasecmp(normalized_uri.s, SIP_PREFIX, SIP_PREFIX_LEN) != 0 && strchr(normalized_uri.s, '@') != NULL)
++ {
++ memmove(normalized_uri.s+SIP_PREFIX_LEN, normalized_uri.s, normalized_uri.len+1);
++ memcpy(normalized_uri.s, SIP_PREFIX, SIP_PREFIX_LEN);
++ normalized_uri.len += SIP_PREFIX_LEN;
++ }
++
++ return &normalized_uri;
++}
++
++#undef SIP_PREFIX
++#undef SIP_PREFIX_LEN
+diff --git a/modules/rls/utils.h b/modules/rls/utils.h
+new file mode 100644
+index 0000000..4b245e7
+--- /dev/null
++++ b/modules/rls/utils.h
+@@ -0,0 +1,31 @@
++/*
++ * rls module - resource list server
++ *
++ * Copyright (C) 2012 AG Projects
++ *
++ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ */
++
++#ifndef RLS_URILS_H
++#define RLS_UTILS_H
++
++#include "../../ut.h"
++
++extern str* normalize_sip_uri(const str *uri);
++
++#endif
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0003-dns_cache.c-fix-compiler-warnings.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0003-dns_cache.c-fix-compiler-warnings.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0003-dns_cache.c-fix-compiler-warnings.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0003-dns_cache.c-fix-compiler-warnings.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,32 @@
+From 9374ee177e5c962eee8c47a1ff30683596114c7b Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Thu, 18 Apr 2013 14:09:09 -0400
+Subject: [PATCH] =?UTF-8?q?dns=5Fcache.c:=20fix=20compiler=20warnings=20=20-?=
+ =?UTF-8?q?=20warning=C3=A2sr=5Fsums[*].r=5Fsum=20may=20be=20used=20uninitia?=
+ =?UTF-8?q?lized=20in=20this=20function=20[-Wuninitialized]=20=20-=20warning?=
+ =?UTF-8?q?=C3=A2sr=5Fsums[*].rr=20may=20be=20used=20uninitialized=20in=20th?=
+ =?UTF-8?q?is=20function=20[-Wuninitialized]=20(cherry=20picked=20from=20com?=
+ =?UTF-8?q?mit=20b3c8f92fe48ac90802c989c74c3a34cfea065861)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ dns_cache.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dns_cache.c b/dns_cache.c
+index b351490..1243c92 100644
+--- a/dns_cache.c
++++ b/dns_cache.c
+@@ -2306,6 +2306,7 @@ inline static struct dns_rr* dns_srv_get_nxt_rr(struct dns_hash_entry* e,
+ servers_up = atomic_get(dns_servers_up);
+ #endif
+
++ memset(r_sums, 0, sizeof(struct r_sums_entry) * MAX_SRV_GRP_IDX);
+ rand_w=0;
+ for(rr=e->rr_lst, n=0;rr && (n<*no);rr=rr->next, n++);/* skip *no records*/
+
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0004-seas-fix-compiler-warning.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0004-seas-fix-compiler-warning.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0004-seas-fix-compiler-warning.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0004-seas-fix-compiler-warning.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,28 @@
+From d74129f1d80a38e29b152351d1c0cf4c1faffce4 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Thu, 18 Apr 2013 15:42:40 -0400
+Subject: [PATCH] seas: fix compiler warning: - warning: variable falgs set
+ but not used [-Wunused-but-set-variable] (cherry picked
+ from commit 63736be1e4d2d6e82a0f7be6a85a96ee66c10146)
+
+---
+ modules/seas/encode_content_disposition.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/modules/seas/encode_content_disposition.c b/modules/seas/encode_content_disposition.c
+index 0b058c6..9e9de34 100644
+--- a/modules/seas/encode_content_disposition.c
++++ b/modules/seas/encode_content_disposition.c
+@@ -61,9 +61,7 @@ int encode_content_disposition(char *hdrstart,int hdrlen,struct disposition *bod
+ int print_encoded_content_disposition(FILE* fd,char *hdr,int hdrlen,unsigned char* payload,int paylen,char *prefix)
+ {
+ int i=3;/* flags + urilength */
+- unsigned char flags=0;
+
+- flags=payload[0];
+ fprintf(fd,"%s",prefix);
+ for(i=0;i<paylen;i++)
+ fprintf(fd,"%s%d%s",i==0?"ENCODED CONTENT-DISPOSITION=[":":",payload[i],i==paylen-1?"]\n":"");
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0005-seas-fix-compiler-warning.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0005-seas-fix-compiler-warning.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0005-seas-fix-compiler-warning.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0005-seas-fix-compiler-warning.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,30 @@
+From 15ec4ac4c0e815d648bbdf0e676227b93860f290 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Thu, 18 Apr 2013 15:45:50 -0400
+Subject: [PATCH] seas: fix compiler warning - warning: variable flags2 set
+ but not used [-Wunused-but-set-variable] (cherry picked
+ from commit 200eddad28abd6bc51da3285dd52d5f8c88c4e56)
+
+---
+ modules/seas/encode_digest.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/modules/seas/encode_digest.c b/modules/seas/encode_digest.c
+index 965d1fd..f355f16 100644
+--- a/modules/seas/encode_digest.c
++++ b/modules/seas/encode_digest.c
+@@ -217,10 +217,9 @@ int print_encoded_digest(FILE *fd,char *hdr,int hdrlen,unsigned char* payload,in
+ int dump_digest_test(char *hdr,int hdrlen,unsigned char* payload,int paylen,FILE* fd,char segregationLevel)
+ {
+ int i=2;/* 2*flags */
+- unsigned char flags1=0,flags2=0;
++ unsigned char flags1=0;
+
+ flags1=payload[0];
+- flags2=payload[1];
+ if(!(segregationLevel & ONLY_URIS))
+ return dump_standard_hdr_test(hdr,hdrlen,payload,paylen,fd);
+ i=2;
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0006-seas-fix-compiler-warning.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0006-seas-fix-compiler-warning.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0006-seas-fix-compiler-warning.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0006-seas-fix-compiler-warning.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,54 @@
+From cb971e61a573d2a024ada52b6036a1cdc56ee68e Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Thu, 18 Apr 2013 15:48:03 -0400
+Subject: [PATCH] seas: fix compiler warning: - warning: variable flags set
+ but not used [-Wunused-but-set-variable] (cherry picked
+ from commit 21386829d819c06c42871cf5b68d0d3a63ef0222)
+
+---
+ modules/seas/encode_route.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/modules/seas/encode_route.c b/modules/seas/encode_route.c
+index f49b327..55c99e5 100644
+--- a/modules/seas/encode_route.c
++++ b/modules/seas/encode_route.c
+@@ -66,10 +66,9 @@
+ int encode_route_body(char *hdr,int hdrlen,rr_t *route_parsed,unsigned char *where)
+ {
+ int i=0,k,route_offset;
+- unsigned char flags,tmp[500];
++ unsigned char tmp[500];
+ rr_t *myroute;
+
+- flags=0;
+ for(route_offset=0,i=0,myroute=route_parsed;myroute;myroute=myroute->next,i++){
+ if((k=encode_route(hdr,hdrlen,myroute,&tmp[route_offset]))<0){
+ LM_ERR("parsing route number %d\n",i);
+@@ -127,10 +126,9 @@ int encode_route(char *hdrstart,int hdrlen,rr_t *body,unsigned char *where)
+
+ int print_encoded_route_body(FILE *fd,char *hdr,int hdrlen,unsigned char *payload,int paylen,char *prefix)
+ {
+- unsigned char flags, numroutes;
++ unsigned char numroutes;
+ int i,offset;
+
+- flags=payload[0];
+ fprintf(fd,"%s",prefix);
+ for(i=0;i<paylen;i++)
+ fprintf(fd,"%s%d%s",i==0?"ENCODED CONTACT BODY:[":":",payload[i],i==paylen-1?"]\n":"");
+@@ -179,10 +177,9 @@ int print_encoded_route(FILE *fd,char *hdr,int hdrlen,unsigned char* payload,int
+
+ int dump_route_body_test(char *hdr,int hdrlen,unsigned char *payload,int paylen,FILE* fd,char segregationLevel,char *prefix)
+ {
+- unsigned char flags, numroutes;
++ unsigned char numroutes;
+ int i,offset;
+
+- flags=payload[0];
+ if(!segregationLevel){
+ return dump_standard_hdr_test(hdr,hdrlen,(unsigned char*)payload,paylen,fd);
+ }
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0007-seas-fix-compiler-warning.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0007-seas-fix-compiler-warning.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0007-seas-fix-compiler-warning.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0007-seas-fix-compiler-warning.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,55 @@
+From 250b90ed1ec6ee34e883a4cbf6ff55865752a2d9 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Thu, 18 Apr 2013 15:50:25 -0400
+Subject: [PATCH] seas: fix compiler warning: - warning: variable flags set
+ but not used [-Wunused-but-set-variable] (cherry picked
+ from commit 2abf2d4a42c05004319e682d2ad07d69bf2fc89e)
+
+---
+ modules/seas/encode_via.c | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/modules/seas/encode_via.c b/modules/seas/encode_via.c
+index 8661055..fa661ef 100644
+--- a/modules/seas/encode_via.c
++++ b/modules/seas/encode_via.c
+@@ -69,10 +69,9 @@
+ int encode_via_body(char *hdr,int hdrlen,struct via_body *via_parsed,unsigned char *where)
+ {
+ int i=0,k,via_offset;
+- unsigned char flags,tmp[500];
++ unsigned char tmp[500];
+ struct via_body *myvia;
+
+- flags=0;
+ if(via_parsed)
+ for(via_offset=0,i=0,myvia=via_parsed;myvia;myvia=myvia->next,i++){
+ if((k=encode_via(hdr,hdrlen,myvia,&tmp[via_offset]))<0){
+@@ -152,10 +151,9 @@ int encode_via(char *hdrstart,int hdrlen,struct via_body *body,unsigned char *wh
+
+ int print_encoded_via_body(FILE *fd,char *hdr,int hdrlen,unsigned char *payload,int paylen,char *prefix)
+ {
+- unsigned char flags, numvias;
++ unsigned char numvias;
+ int i,offset;
+
+- flags=payload[0];
+ fprintf(fd,"%s",prefix);
+ for(i=0;i<paylen;i++)
+ fprintf(fd,"%s%d%s",i==0?"ENCODED VIA BODY:[":":",payload[i],i==paylen-1?"]\n":"");
+@@ -226,11 +224,9 @@ int print_encoded_via(FILE *fd,char *hdr,int hdrlen,unsigned char* payload,int p
+
+ int dump_via_body_test(char *hdr,int hdrlen,unsigned char *payload,int paylen,FILE* fd,char segregationLevel)
+ {
+- unsigned char flags, numvias;
++ unsigned char numvias;
+ int i,offset;
+
+- flags=payload[0];
+-
+ if(!segregationLevel){
+ return dump_standard_hdr_test(hdr,hdrlen,payload,paylen,fd);
+ }
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0008-seas-fix-compiler-warning-Wunused-but-set-variable.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0008-seas-fix-compiler-warning-Wunused-but-set-variable.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0008-seas-fix-compiler-warning-Wunused-but-set-variable.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0008-seas-fix-compiler-warning-Wunused-but-set-variable.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,29 @@
+From 2fe9c5d1f7b0640b1e50976f4187d7362d6a3343 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Thu, 18 Apr 2013 15:51:50 -0400
+Subject: [PATCH] seas: fix compiler warning [-Wunused-but-set-variable]
+ (cherry picked from commit
+ 21e51107a5a08b182abc7bffbac1fec1be27950b)
+
+---
+ modules/seas/event_dispatcher.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/seas/event_dispatcher.c b/modules/seas/event_dispatcher.c
+index eb73055..d10cffe 100644
+--- a/modules/seas/event_dispatcher.c
++++ b/modules/seas/event_dispatcher.c
+@@ -896,8 +896,8 @@ error:
+ */
+ int process_unbind_action(as_p as,unsigned char processor_id,unsigned int flags,char *payload,int len)
+ {
+- int i,k;
+- k=0;
++ int i;
++
+ for(i=0;i<as->num_binds;i++){
+ if(as->bound_processor[i] == processor_id)
+ break;
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0009-seas-fix-compiler-warning-Wunused-but-set-variable.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0009-seas-fix-compiler-warning-Wunused-but-set-variable.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0009-seas-fix-compiler-warning-Wunused-but-set-variable.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0009-seas-fix-compiler-warning-Wunused-but-set-variable.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,62 @@
+From 3141c87bc4270ca2534250500dfdefa66c79a48f Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Thu, 18 Apr 2013 15:54:14 -0400
+Subject: [PATCH] seas: fix compiler warning [-Wunused-but-set-variable]
+ (cherry picked from commit
+ 12cd241d95b8d38cea6e60676b752f8ef8a2ed8c)
+
+---
+ modules/seas/seas_action.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/modules/seas/seas_action.c b/modules/seas/seas_action.c
+index bad30e4..7e2e4f1 100644
+--- a/modules/seas/seas_action.c
++++ b/modules/seas/seas_action.c
+@@ -811,11 +811,11 @@ int ac_sl_msg(as_p the_as,unsigned char processor_id,unsigned int flags,char *ac
+ str *uri;
+ struct proxy_l *proxy;
+ rr_t *my_route;
+- int i,k,retval;
++ int k,retval;
+ //enum sip_protos proto;
+
+ my_msg=NULL;
+- i=k=0;
++ k=0;
+
+ proxy=0;
+
+@@ -936,7 +936,7 @@ int ac_uac_req(as_p the_as,unsigned char processor_id,unsigned int flags,char *a
+ struct cseq_body *cseqb;
+ struct as_uac_param *the_param;
+ dlg_t *my_dlg;
+- int i,k,retval,uac_id,sip_error,ret,err_ret;
++ int k,retval,uac_id,sip_error,ret,err_ret;
+ long clen;
+ str headers,body,fake_uri;
+ uac_req_t uac_r;
+@@ -945,7 +945,7 @@ int ac_uac_req(as_p the_as,unsigned char processor_id,unsigned int flags,char *a
+ my_dlg=NULL;
+ my_msg=NULL;
+ the_param=NULL;
+- i=k=clen=0;
++ k=clen=0;
+
+ net2hostL(uac_id,action,k);
+
+@@ -1480,11 +1480,9 @@ void uac_cb(struct cell* t, int type,struct tmcb_params *rcvd_params)
+ as_msg_p my_as_ev=0;
+ int mylen,code,i;
+ struct as_uac_param *ev_info;
+- struct sip_msg *msg;
+ char *buffer;
+
+ ev_info=(struct as_uac_param*)*rcvd_params->param;
+- msg=rcvd_params->rpl;
+ code=rcvd_params->code;
+ buffer=0;
+ if(!ev_info || !ev_info->who){
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0010-seas-fix-compiler-warning-Wunused-but-set-variable.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0010-seas-fix-compiler-warning-Wunused-but-set-variable.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0010-seas-fix-compiler-warning-Wunused-but-set-variable.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0010-seas-fix-compiler-warning-Wunused-but-set-variable.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,43 @@
+From d3999770dec8628a214423bcdcc510d90a39dc40 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Thu, 18 Apr 2013 16:01:16 -0400
+Subject: [PATCH] seas: fix compiler warning [-Wunused-but-set-variable]
+ (cherry picked from commit
+ c0f4b6cf664ac552d0c994e99adb13991a37ef28)
+
+---
+ modules/seas/statistics.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/modules/seas/statistics.c b/modules/seas/statistics.c
+index 0dfb66f..31a44c6 100644
+--- a/modules/seas/statistics.c
++++ b/modules/seas/statistics.c
+@@ -169,8 +169,10 @@ static inline int assignIndex(int i)
+ */
+ inline void action_stat(struct cell *t)
+ {
+- unsigned int seas_dispatch,as_delay;
+- struct timeval *t1,*t2,*t3;
++ unsigned int seas_dispatch;
++ //unsigned int as_delay;
++ struct timeval *t1,*t2;
++ //struct timeval *t3;
+ struct statscell *s;
+ struct totag_elem *to;
+ if(t==0)
+@@ -194,9 +196,9 @@ inline void action_stat(struct cell *t)
+ return;
+ t1=&(s->u.uas.as_relay);
+ t2=&(s->u.uas.event_sent);
+- t3=&(s->u.uas.action_recvd);
++ //t3=&(s->u.uas.action_recvd);
+ seas_dispatch = (t2->tv_sec - t1->tv_sec)*1000 + (t2->tv_usec-t1->tv_usec)/1000;
+- as_delay = (t3->tv_sec - t2->tv_sec)*1000 + (t3->tv_usec-t2->tv_usec)/1000;
++ //as_delay = (t3->tv_sec - t2->tv_sec)*1000 + (t3->tv_usec-t2->tv_usec)/1000;
+
+ lock_get(seas_stats_table->mutex);
+ {
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0011-seas-fix-warning-Wunused-result.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0011-seas-fix-warning-Wunused-result.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0011-seas-fix-warning-Wunused-result.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0011-seas-fix-warning-Wunused-result.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,30 @@
+From b654a0d650af61bd4ec7212b48d71ccf7243e473 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Thu, 18 Apr 2013 16:03:50 -0400
+Subject: [PATCH] seas: fix warning [-Wunused-result] - ignoring return value
+ of write, declared with attribute warn_unused_result
+ [-Wunused-result] (cherry picked from commit
+ e3c0a3abb6045e841fbb4b1b61a518b2b87a217d)
+
+---
+ modules/seas/seas_action.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/modules/seas/seas_action.c b/modules/seas/seas_action.c
+index 7e2e4f1..d1267d5 100644
+--- a/modules/seas/seas_action.c
++++ b/modules/seas/seas_action.c
+@@ -1410,7 +1410,9 @@ int as_action_fail_resp(int uac_id,int sip_error,char *err_buf,int i)
+ k+=i;
+ ev_len=htonl(k);
+ memcpy(msg,&ev_len,4);
+- write(my_as->u.as.action_fd,msg,k);
++ if(write(my_as->u.as.action_fd,msg,k)<=0){
++ LM_DBG("Ignoring error write\n");
++ }
+ return 0;
+ }
+
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0012-auth_diameter-remove-unused-but-set-variable.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0012-auth_diameter-remove-unused-but-set-variable.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0012-auth_diameter-remove-unused-but-set-variable.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0012-auth_diameter-remove-unused-but-set-variable.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,55 @@
+From 68021c3247b096fabc287fc6d129bce463cbfa97 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Wed, 20 Mar 2013 13:00:27 -0400
+Subject: [PATCH] auth_diameter: remove unused but set variable (cherry picked
+ from commit 941c48ae6909994ae090c9d52766cd4dd5d4f938)
+
+---
+ modules/auth_diameter/auth_diameter.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/modules/auth_diameter/auth_diameter.c b/modules/auth_diameter/auth_diameter.c
+index 5dc73ff..e17e067 100644
+--- a/modules/auth_diameter/auth_diameter.c
++++ b/modules/auth_diameter/auth_diameter.c
+@@ -212,13 +212,10 @@ int diameter_www_authorize(struct sip_msg* _msg, char* _realm, char* _s2)
+
+ static int group_fixup(void** param, int param_no)
+ {
+- void* ptr;
+ str* s;
+
+ if (param_no == 1)
+ {
+- ptr = *param;
+-
+ if (!strcasecmp((char*)*param, "Request-URI"))
+ {
+ *param = (void*)1;
+@@ -245,8 +242,6 @@ static int group_fixup(void** param, int param_no)
+
+ LM_ERR("unsupported Header Field identifier\n");
+ return E_UNSPEC;
+-
+- //pkg_free(ptr);
+ }
+
+ if (param_no == 2)
+@@ -257,14 +252,12 @@ static int group_fixup(void** param, int param_no)
+ LM_ERR("no pkg memory left\n");
+ return E_UNSPEC;
+ }
+- ptr = *param;
+ s->s = (char*)*param;
+ s->len = strlen(s->s);
+ *param = (void*)s;
+ }
+
+ end:
+-// pkg_free(ptr);
+ return 0;
+ }
+
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0013-auth_diameter-remove-unused-but-set-variable.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0013-auth_diameter-remove-unused-but-set-variable.patch?rev=10154&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0013-auth_diameter-remove-unused-but-set-variable.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0013-auth_diameter-remove-unused-but-set-variable.patch Tue May 7 16:17:22 2013
@@ -1,0 +1,35 @@
+From 3a18564eb905d93b85b9e0527fa40cd85eb2e3b7 Mon Sep 17 00:00:00 2001
+From: Ovidiu Sas <osas at voipembedded.com>
+Date: Wed, 20 Mar 2013 13:02:16 -0400
+Subject: [PATCH] auth_diameter: remove unused but set variable (cherry picked
+ from commit 387adace552c22eaf15a049b23694bcd79cea3a8)
+
+---
+ modules/auth_diameter/authorize.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/modules/auth_diameter/authorize.c b/modules/auth_diameter/authorize.c
+index 7b4f67c..6660057 100644
+--- a/modules/auth_diameter/authorize.c
++++ b/modules/auth_diameter/authorize.c
+@@ -295,7 +295,7 @@ int authorize(struct sip_msg* msg, pv_elem_t* realm, int hftype)
+ int diameter_authorize(struct hdr_field* hdr, str* p_method, struct sip_uri uri,
+ struct sip_uri ruri, unsigned int m_id, rd_buf_t* rb)
+ {
+- str method, user_name;
++ str user_name;
+ AAAMessage *req;
+ AAA_AVP *avp, *position;
+ int name_flag, port_flag;
+@@ -316,8 +316,6 @@ int diameter_authorize(struct hdr_field* hdr, str* p_method, struct sip_uri uri,
+ else
+ cred = NULL;
+
+- method = *p_method;
+-
+ if(!cred)
+ {
+ /* Username AVP */
+--
+1.7.10.4
+
More information about the Pkg-voip-commits
mailing list