You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1086
-- Commit Summary --
* pkg/kamailio: Fix of ticket 1085
-- File Changes --
M pkg/kamailio/centos/7/kamailio.service (2)
M pkg/kamailio/deb/debian/kamailio.service (2)
M pkg/kamailio/deb/jessie/kamailio.service (2)
M pkg/kamailio/deb/sid/kamailio.service (2)
M pkg/kamailio/deb/stretch/kamailio.service (2)
M pkg/kamailio/deb/xenial/kamailio.service (2)
M pkg/kamailio/fedora/17/kamailio.service (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1086.patchhttps://github.com/kamailio/kamailio/pull/1086.diff
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/1086
Module: kamailio
Branch: master
Commit: cdfd0d460fbfe7a2cd2343b3829d3df88a943cd8
URL: https://github.com/kamailio/kamailio/commit/cdfd0d460fbfe7a2cd2343b3829d3df…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-10-07T22:49:58+02:00
Makefile.defs: improve and extend comment about compilation mode
---
Modified: src/Makefile.defs
---
Diff: https://github.com/kamailio/kamailio/commit/cdfd0d460fbfe7a2cd2343b3829d3df…
Patch: https://github.com/kamailio/kamailio/commit/cdfd0d460fbfe7a2cd2343b3829d3df…
---
diff --git a/src/Makefile.defs b/src/Makefile.defs
index fe4dc4ce2f..da9e95585a 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -698,8 +698,8 @@ C_DEFS+= -DSHM_MEM -DSHM_MMAP \
# you may also want to set -DPROFILING
# WARNING: do not add mode=debug or mode=release anymore in the Makefile,
-# use make mode=debug all instead. Anyway no by default ser is compiled w/
-# debugging symbols in all cases (-g). --andrei
+# use make mode=debug all instead. By default Kamailio is compiled with
+# debugging symbols in all cases (-g) and without optimization (-O0).
# memory managers and related debug mode
C_DEFS+= -DMEM_JOIN_FREE
Module: kamailio
Branch: master
Commit: 58325bb8ae28ff291d594782bc3bfdd8e811d0a9
URL: https://github.com/kamailio/kamailio/commit/58325bb8ae28ff291d594782bc3bfdd…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-10-07T10:29:46+02:00
core: remove obselete parse_hostport functionality, deactivated since 2003
---
Removed: src/core/parser/parse_hostport.c
Removed: src/core/parser/parse_hostport.h
---
Diff: https://github.com/kamailio/kamailio/commit/58325bb8ae28ff291d594782bc3bfdd…
Patch: https://github.com/kamailio/kamailio/commit/58325bb8ae28ff291d594782bc3bfdd…
---
diff --git a/src/core/parser/parse_hostport.c b/src/core/parser/parse_hostport.c
deleted file mode 100644
index 4fbd1a4566..0000000000
--- a/src/core/parser/parse_hostport.c
+++ /dev/null
@@ -1,59 +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 Parser :: Parse domain/hostname and port argument
- *
- * \ingroup parser
- */
-
-
-#ifdef _OBSOLETED
-
-#include "parse_hostport.h"
-#include <string.h> /* strlen */
-#include "../dprint.h"
-#include "../ut.h" /* str2s */
-
-char* parse_hostport(char* buf, str* host, short int* port)
-{
- char *tmp;
- int err;
-
- host->s=buf;
- for(tmp=buf;(*tmp)&&(*tmp!=':');tmp++);
- host->len=tmp-buf;
- if (*tmp==0) {
- *port=0;
- } else {
- *tmp=0;
- *port=str2s((unsigned char*)(tmp+1), strlen(tmp+1), &err);
- if (err ){
- LOG(L_INFO,
- "ERROR: hostport: trailing chars in port number: %s\n",
- tmp+1);
- /* report error? */
- }
- }
-
- return host->s;
-}
-
-#endif
diff --git a/src/core/parser/parse_hostport.h b/src/core/parser/parse_hostport.h
deleted file mode 100644
index 10f5f0ceed..0000000000
--- a/src/core/parser/parse_hostport.h
+++ /dev/null
@@ -1,35 +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 Parser :: Parse domain/hostname and port argument
- *
- * \ingroup parser
- */
-
-
-#ifndef PARSE_HOSTPORT_H
-#define PARSE_HOSTPORT_H
-
-#include "../str.h"
-
-char* parse_hostport(char* buf, str* host, short int* port);
-
-#endif /* PARSE_HOSTPORT_H */
Module: kamailio
Branch: master
Commit: b64a25874e376c00ce60570117d33550af568497
URL: https://github.com/kamailio/kamailio/commit/b64a25874e376c00ce60570117d3355…
Author: Henning Westerholt <hw(a)kamailio.org>
Committer: Henning Westerholt <hw(a)kamailio.org>
Date: 2018-10-07T09:56:59+02:00
core: remove old code for BRANCH_IGNORE_3261_VIA and BRANCH_INCLUDE_FROMTO_BODY
- remove old code for BRANCH_IGNORE_3261_VIA and BRANCH_INCLUDE_FROMTO_BODY
- this was used in pre-3.1 version times and deactivated in #ifdef since 2010
---
Modified: src/core/char_msg_val.h
---
Diff: https://github.com/kamailio/kamailio/commit/b64a25874e376c00ce60570117d3355…
Patch: https://github.com/kamailio/kamailio/commit/b64a25874e376c00ce60570117d3355…
---
diff --git a/src/core/char_msg_val.h b/src/core/char_msg_val.h
index 4d6887d713..79461cd836 100644
--- a/src/core/char_msg_val.h
+++ b/src/core/char_msg_val.h
@@ -18,14 +18,6 @@
* @file
* @ingroup core
* \author andrei
- *
- * Defines:
- * BRANCH_INCLUDE_FROMTO_BODY - if defined the old (pre 3.1) mode of
- * including the full from & to bodies will be used (instead of only the
- * tags).
- * BRANCH_IGNORE_3261_VIA - if defined, no check and special/simpler handling
- * of messages with 3261 cookies in the via branch will be made (same
- * behaviour as in pre 3.1 versions).
*/
#ifndef __char_msg_val_h
@@ -52,20 +44,6 @@ inline static int char_msg_val( struct sip_msg *msg, char *cv )
memset( cv, '0', MD5_LEN );
return 0;
}
-#ifndef BRANCH_IGNORE_3261_VIA
- if (likely(msg->via1->branch && msg->via1->branch->value.len>MCOOKIE_LEN &&
- memcmp(msg->via1->branch->value.s, MCOOKIE, MCOOKIE_LEN)==0)){
- /* 3261 branch cookie present => hash only the received branch ID */
- src[0]=msg->via1->branch->value;
- MD5StringArray ( cv, src, 1 );
- return 1; /* success */
- }
-#endif /* BRANCH_IGNORE_3261_VIA */
-#ifdef BRANCH_INCLUDE_FROMTO_BODY
- /* use the from & to full bodies */
- src[0]= msg->from->body;
- src[1]= msg->to->body;
-#else
/* to body is automatically parsed (via check_transactionquadruple /
parse_header), but the from body has to be parsed manually */
if (msg->from->parsed==0){
@@ -78,7 +56,6 @@ inline static int char_msg_val( struct sip_msg *msg, char *cv )
/* use only the from & to tags */
src[0]=get_from(msg)->tag_value;
src[1]=get_to(msg)->tag_value;
-#endif /* BRANCH_INCLUDE_FROMTO_BODY */
src[2]= msg->callid->body;
src[3]= msg->first_line.u.request.uri;
src[4]= get_cseq( msg )->number;