sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

A matter of project marketing
by Olle E. Johansson 20 Sep '11

20 Sep '11

Friends, A few days ago I got complains in the IRC channel that kamailio was a dead project because there was never anyone in the channel to support it. It might be helpful for the project if more of us try to connect to the #kamailio and #sip-router channels more frequently. It's quite empty. From the Sip-Router marketing dept. /O

6 12

[tracker] Comment added: crash at startup if listen address does not exist
by sip-router 20 Sep '11

20 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#145 - crash at startup if listen address does not exist User who did this - Juha Heinanen (jh) ---------- (gdb) frame 1 #1 0x080f3739 in find_mod_export_record (mod=0xb75092e8 "db_mysql", name=0xb72dc1e3 "db_bind_api", param_no=0, flags=0, mod_if_ver=0xbfcb5bac) at sr_module.c:621 warning: Source file is more recent than executable. 621 if (mod!=0 && (strcmp(t->exports.name, mod) !=0)) (gdb) p *t $1 = {path = 0x6d5f6264 <Address 0x6d5f6264 out of bounds>, handle = 0x6c717379, orig_mod_interface_ver = 1865363258, exports = { name = 0x786e6570 <Address 0x786e6570 out of bounds>, cmds = 0x706f3a67, params = 0x67786e65, init_f = 0x40333231, response_f = 0x61636f6c, destroy_f = 0x736f686c, onbreak_f = 0x65732f74, init_child_f = 0xb66d0072 <w_setsflag+258>, dlflags = 0, rpc_methods = 0x0, stats = 0x0, mi_cmds = 0x0, items = 0x0, procs = 0x0}, next = 0xb730c2f8} ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=145#comment283 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: crash at startup if listen address does not exist
by sip-router 20 Sep '11

20 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#145 - crash at startup if listen address does not exist User who did this - Daniel-Constantin Mierla (miconda) ---------- It happens after the modules were loaded, so still is not clear why the comparison between the name of the module from function parameter against the one from modules list crashes. Probably some corruption, if you have the core file, with gdb, do: frame 1 p *t Let's see the content of t variable, maybe it is corrupted. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=145#comment282 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: crash at startup if listen address does not exist
by sip-router 20 Sep '11

20 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#145 - crash at startup if listen address does not exist User who did this - Juha Heinanen (jh) ---------- Debug messages mailed privately to Daniel. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=145#comment281 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task closed: fix_nated_sdp("1") cannot handle more than one media description
by sip-router 20 Sep '11

20 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#157 - fix_nated_sdp("1") cannot handle more than one media description User who did this - Juha Heinanen (jh) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=157 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] User took ownership: fix_nated_sdp("1") cannot handle more than one media description
by sip-router 20 Sep '11

20 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Juha Heinanen has taken ownership of the following task: FS#157 - fix_nated_sdp("1") cannot handle more than one media description More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=157 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: modules_k/nathelper: fix_nated_sdp("1") fix
by Juha Heinanen 20 Sep '11

20 Sep '11

Module: sip-router Branch: master Commit: 4b220639cb255a20bac762fd60e36a4336339a45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b22063… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Sep 20 09:46:53 2011 +0300 modules_k/nathelper: fix_nated_sdp("1") fix - Call fix_nated_sdp("1") now adds a=direction:active line after every m line in sdp. Earlier it just added one a=direction:active line at the end of body. --- modules_k/nathelper/nathelper.c | 44 ++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index a7186d7..f734a8d 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -1352,8 +1352,8 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2) { str body; str ip; - int level; - char *buf; + int level, rest_len; + char *buf, *m_start, *m_end, *rest_s; struct lump* anchor; level = (int)(long)str1; @@ -1366,28 +1366,48 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2) } if (level & (ADD_ADIRECTION | ADD_ANORTPPROXY)) { + msg->msg_flags |= FL_FORCE_ACTIVE; - anchor = anchor_lump(msg, body.s + body.len - msg->buf, 0, 0); - if (anchor == NULL) { - LM_ERR("anchor_lump failed\n"); - return -1; - } + if (level & ADD_ADIRECTION) { + m_start = ser_memmem(body.s, "\r\nm=", body.len, 4); + while (m_start != NULL) { + m_start = m_start + 2; + rest_len = body.len - (m_start - body.s); + m_end = ser_memmem(m_start, "\r\n", rest_len, 2); + if (m_end == NULL) { + LM_ERR("m line is not crlf terminated\n"); + return -1; + } + anchor = anchor_lump(msg, m_end - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump failed\n"); + return -1; + } buf = pkg_malloc((ADIRECTION_LEN + CRLF_LEN) * sizeof(char)); if (buf == NULL) { - LM_ERR("out of pkg memory\n"); - return -1; + LM_ERR("out of pkg memory\n"); + return -1; } memcpy(buf, CRLF, CRLF_LEN); memcpy(buf + CRLF_LEN, ADIRECTION, ADIRECTION_LEN); if (insert_new_lump_after(anchor, buf, ADIRECTION_LEN + CRLF_LEN, 0) == NULL) { - LM_ERR("insert_new_lump_after failed\n"); - pkg_free(buf); - return -1; + LM_ERR("insert_new_lump_after failed\n"); + pkg_free(buf); + return -1; } + rest_s = m_end + 2; + rest_len = body.len - (rest_s - body.s); + m_start = ser_memmem(rest_s, "\r\nm=", rest_len, 4); + } } if ((level & ADD_ANORTPPROXY) && nortpproxy_str.len) { + anchor = anchor_lump(msg, body.s + body.len - msg->buf, 0, 0); + if (anchor == NULL) { + LM_ERR("anchor_lump failed\n"); + return -1; + } buf = pkg_malloc((nortpproxy_str.len + CRLF_LEN) * sizeof(char)); if (buf == NULL) { LM_ERR("out of pkg memory\n");

1 0

[tracker] Task opened: fix_nated_sdp("1") cannot handle more than one media description
by sip-router 20 Sep '11

20 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - fix_nated_sdp("1") cannot handle more than one media description Task Type - Bug Report Category - Module Status - New Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - fix_nated_sdp("1") implementation simply adds line a=direction:active line to the end of message body. this sort of works if sdp contains only one media description. if it contains more than one, the line must be added to all of them. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=157 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Comment added: crash at startup if listen address does not exist
by sip-router 19 Sep '11

19 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#145 - crash at startup if listen address does not exist User who did this - Daniel-Constantin Mierla (miconda) ---------- This partial log does not help. The crash is caused by the procedure of calling destroy functions from the module. This process is caused by the error of not being able to listen on given address, but the actual crash was from destroy function in htable module. I was looking at the line of crash and happens when comparing a module name given as parameter (db_mysql in this case) with those in the list of loaded modules. If no module was loaded then the list is NULL and no comparison should happen. I need at least the log messages printed from sr_module.c functions and those related to htable module. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=145#comment280 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:andrei/armv7: core: armv7 & improved armv6 support
by Andrei Pelinescu-Onciul 19 Sep '11

19 Sep '11

Module: sip-router Branch: andrei/armv7 Commit: b092c2d10f4672dbcf387603ce08c86f10a7cdc4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b092c2d… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Sep 19 17:21:52 2011 +0200 core: armv7 & improved armv6 support Experimental armv7 support & armv6 smp. --- atomic/atomic_arm.h | 67 ++++++++++++++++++++++++++++++++++++++---------- atomic/atomic_native.h | 4 +- fastlock.h | 63 +++++++++++++++++++++++++++++++++----------- 3 files changed, 102 insertions(+), 32 deletions(-) diff --git a/atomic/atomic_arm.h b/atomic/atomic_arm.h index b5497a2..dc61111 100644 --- a/atomic/atomic_arm.h +++ b/atomic/atomic_arm.h @@ -25,6 +25,7 @@ * - NOSMP * - __CPU_arm * - __CPU_arm6 - armv6 support (supports atomic ops via ldrex/strex) + * - __CPU_arm7 - armv7 support * @ingroup atomic */ @@ -47,13 +48,39 @@ #ifdef NOSMP #define HAVE_ASM_INLINE_MEMBAR #define membar() asm volatile ("" : : : "memory") /* gcc do not cache barrier*/ + +#else /* SMP */ + +#ifdef __CPU_arm7 + +#define HAVE_ASM_INLINE_MEMBAR +#define membar() asm volatile ("dmb" : : : "memory") + +#elif defined __CPU_arm6 + +#define HAVE_ASM_INLINE_MEMBAR +/* arm6 implements memory barriers using CP15 */ +#define membar() asm volatile ("mcr p15, 0, %0, c7, c10, 5" \ + : : "r"(0) : "memory") + +#else +#warning SMP not supported for arm atomic ops, try compiling with -DNOSMP +/* fall back to default lock based barriers (don't define HAVE_ASM...) */ +#endif /* __CPU_arm7 / __CPU_arm6 */ + +#endif /* NOSMP */ + + +/* all other membars are either empty or the same as membar(), + irrespective of the SMP or NOSMP mode */ +#ifdef HAVE_ASM_INLINE_MEMBAR + #define membar_read() membar() #define membar_write() membar() #define membar_depends() do {} while(0) /* really empty, not even a cc bar.*/ -/* lock barriers: empty, not needed for NOSMP; the lock/unlock should already - * contain gcc barriers*/ -#define membar_enter_lock() do {} while(0) -#define membar_leave_lock() do {} while(0) +/* lock barriers */ +#define membar_enter_lock() membar() +#define membar_leave_lock() membar() /* membars after or before atomic_ops or atomic_setget -> use these or * mb_<atomic_op_name>() if you need a memory barrier in one of these * situations (on some archs where the atomic operations imply memory @@ -65,19 +92,18 @@ #define membar_write_atomic_setget() membar_write() #define membar_read_atomic_op() membar_read() #define membar_read_atomic_setget() membar_read() -#else /* SMP */ -#warning SMP not supported for arm atomic ops, try compiling with -DNOSMP -/* fall back to default lock based barriers (don't define HAVE_ASM...) */ -#endif /* NOSMP */ +#endif /* HAVE_ASM_INLINE_MEMBAR */ -#ifdef __CPU_arm6 + + +#if defined __CPU_arm6 || defined __CPU_arm7 #define HAVE_ASM_INLINE_ATOMIC_OPS /* hack to get some membars */ -#ifndef NOSMP +#if !defined NOSMP && !defined HAVE_ASM_INLINE_MEMBAR #include "atomic_unknown.h" #endif @@ -138,7 +164,19 @@ return RET_EXPR; \ } +#define ATOMIC_XCHG_DECL(NAME, P_TYPE) \ + inline static P_TYPE atomic_##NAME##_##P_TYPE (volatile P_TYPE *var, \ + P_TYPE v ) \ + { \ + P_TYPE ret; \ + asm volatile( \ + ATOMIC_ASM_OP2() \ + : "=&r"(ret), "=&r"(tmp), "=m"(*var) : "r"(var), "r"(v) : "cc" \ + ); \ + return ret; \ + } +/* old swp based version (doesn't work on arm7) #define ATOMIC_XCHG_DECL(NAME, P_TYPE) \ inline static P_TYPE atomic_##NAME##_##P_TYPE (volatile P_TYPE *var, \ P_TYPE v ) \ @@ -151,6 +189,7 @@ ); \ return ret; \ } +*/ /* cmpxchg: %5=old, %4=new_v, %3=var @@ -186,8 +225,8 @@ ATOMIC_FUNC_DECL1(and, "and %1, %0, %4", int, void, /* no return */ ) ATOMIC_FUNC_DECL1(or, "orr %1, %0, %4", int, void, /* no return */ ) ATOMIC_FUNC_DECL(inc_and_test, "add %1, %0, #1", int, int, ret==0 ) ATOMIC_FUNC_DECL(dec_and_test, "sub %1, %0, #1", int, int, ret==0 ) -//ATOMIC_FUNC_DECL2(get_and_set, /* no extra op needed */ , int, int, ret) -ATOMIC_XCHG_DECL(get_and_set, int) +ATOMIC_FUNC_DECL2(get_and_set, "" /* no extra op needed */ , int, int, ret) +//ATOMIC_XCHG_DECL(get_and_set, int) ATOMIC_CMPXCHG_DECL(cmpxchg, int) ATOMIC_FUNC_DECL1(add, "add %1, %0, %4", int, int, ret ) @@ -197,8 +236,8 @@ ATOMIC_FUNC_DECL1(and, "and %1, %0, %4", long, void, /* no return */ ) ATOMIC_FUNC_DECL1(or, "orr %1, %0, %4", long, void, /* no return */ ) ATOMIC_FUNC_DECL(inc_and_test, "add %1, %0, #1", long, long, ret==0 ) ATOMIC_FUNC_DECL(dec_and_test, "sub %1, %0, #1", long, long, ret==0 ) -//ATOMIC_FUNC_DECL2(get_and_set, /* no extra op needed */ , long, long, ret) -ATOMIC_XCHG_DECL(get_and_set, long) +ATOMIC_FUNC_DECL2(get_and_set, "" /* no extra op needed */ , long, long, ret) +//ATOMIC_XCHG_DECL(get_and_set, long) ATOMIC_CMPXCHG_DECL(cmpxchg, long) ATOMIC_FUNC_DECL1(add, "add %1, %0, %4", long, long, ret ) diff --git a/atomic/atomic_native.h b/atomic/atomic_native.h index 499e846..3086269 100644 --- a/atomic/atomic_native.h +++ b/atomic/atomic_native.h @@ -30,7 +30,7 @@ * - __CPU_ppc, __CPU_ppc64 - see atomic_ppc.h * - __CPU_sparc - see atomic_sparc.h * - __CPU_sparc64, SPARC64_MODE - see atomic_sparc64.h - * - __CPU_arm, __CPU_arm6 - see atomic_arm.h + * - __CPU_arm, __CPU_arm6, __CPU_arm7 - see atomic_arm.h * - __CPU_alpha - see atomic_alpha.h * @ingroup atomic */ @@ -69,7 +69,7 @@ #include "atomic_sparc.h" -#elif defined __CPU_arm || defined __CPU_arm6 +#elif defined __CPU_arm || defined __CPU_arm6 || defined __CPU_arm7 #include "atomic_arm.h" diff --git a/fastlock.h b/fastlock.h index a09f0e9..c17322b 100644 --- a/fastlock.h +++ b/fastlock.h @@ -47,6 +47,7 @@ * 2006-11-22 arm early clobber added: according to the swp instruction * specification the address register must be != from the other 2 * (Julien Blache <jblache(a)debian.org>) + * 2011-09-19 arm v7 and arm v6 smp experimental support (andrei) * */ @@ -91,7 +92,7 @@ typedef volatile int fl_lock_t; #elif defined(__CPU_sparc64) #ifndef NOSMP #define membar_getlock() \ - asm volatile ("membar #StoreStore | #StoreLoad \n\t" : : : "memory"); + asm volatile ("membar #StoreStore | #StoreLoad \n\t" : : : "memory") /* can be either StoreStore|StoreLoad or LoadStore|LoadLoad * since ldstub acts both as a store and as a load */ #else @@ -102,40 +103,55 @@ typedef volatile int fl_lock_t; #elif defined(__CPU_sparc) #define membar_getlock()/* no need for a compiler barrier, already included */ -#elif defined __CPU_arm || defined __CPU_arm6 +#elif defined __CPU_arm #ifndef NOSMP -#warning smp not supported on arm* (no membars), try compiling with -DNOSMP +#warning smp not supported on arm < 6 (no membars), try compiling with -DNOSMP +#endif /* NOSMP */ +#define membar_getlock() + +#elif defined __CPU_arm6 +#ifndef NOSMP +#define membar_getlock() asm volatile ("mcr p15, 0, %0, c7, c10, 5" \ + : : "r"(0) : "memory") +#else /* NOSMP */ +#define membar_getlock() +#endif /* NOSMP */ + +#elif defined __CPU_arm7 +#ifndef NOSMP +#define membar_getlock() asm volatile ("dmb" : : : "memory") +#else /* NOSMP */ +#define membar_getlock() #endif /* NOSMP */ -#define membar_getlock() #elif defined(__CPU_ppc) || defined(__CPU_ppc64) #ifndef NOSMP #define membar_getlock() \ - asm volatile("lwsync \n\t" : : : "memory"); + asm volatile("lwsync \n\t" : : : "memory") #else -#define membar_getlock() +#define membar_getlock() #endif /* NOSMP */ #elif defined __CPU_mips2 || defined __CPU_mips64 #ifndef NOSMP #define membar_getlock() \ - asm volatile("sync \n\t" : : : "memory"); + asm volatile("sync \n\t" : : : "memory") #else -#define membar_getlock() +#define membar_getlock() #endif /* NOSMP */ #elif defined __CPU_mips #ifndef NOSMP #warning smp not supported on mips1 (no membars), try compiling with -DNOSMP #endif -#define membar_getlock() +#define membar_getlock() #elif defined __CPU_alpha #ifndef NOSMP #define membar_getlock() \ - asm volatile("mb \n\t" : : : "memory"); + asm volatile("mb \n\t" : : : "memory") #else -#define membar_getlock() +#define membar_getlock() #endif /* NOSMP */ #else /* __CPU_xxx */ @@ -211,7 +227,7 @@ inline static int tsl(fl_lock_t* lock) "swp %0, %2, [%3] \n\t" : "=&r" (val), "=m"(*lock) : "r"(1), "r" (lock) : "memory" ); -#elif defined __CPU_arm6 +#elif defined __CPU_arm6 || defined __CPU_arm7 asm volatile( " ldrex %0, [%2] \n\t" " cmp %0, #0 \n\t" @@ -219,6 +235,7 @@ inline static int tsl(fl_lock_t* lock) /* if %0!=0 => either it was 1 initially or was 0 * and somebody changed it just before the strexeq (so the * lock is taken) => it's safe to return %0 */ + /* membar_getlock must be called outside this function */ : "=&r"(val), "=m"(*lock) : "r"(lock), "r"(1) : "cc" ); #elif defined(__CPU_ppc) || defined(__CPU_ppc64) @@ -362,14 +379,28 @@ inline static void release_lock(fl_lock_t* lock) "stb %%g0, [%1] \n\t" : "=m"(*lock) : "r" (lock) : "memory" ); -#elif defined __CPU_arm || defined __CPU_arm6 -#ifndef NOSMP +#elif defined __CPU_arm || defined __CPU_arm6 || defined __CPU_arm7 +#if !defined NOSMP && defined __CPU_arm #warning arm* smp mode not supported (no membars), try compiling with -DNOSMP #endif + /* missuse membar_getlock */ + membar_getlock(); asm volatile( - " str %1, [%2] \n\r" - : "=m"(*lock) : "r"(0), "r"(lock) : "memory" + " str %1, [%2] \n\r" + : "=m"(*lock) : "r"(0), "r"(lock) : "cc", "memory" ); +#ifdef __CPU_arm6 + /* drain store buffer: drain the per processor buffer into the L1 cache + making all the changes visible to other processors */ + asm volatile( + "mcr p15, 0, %0, c7, c10, 4 \n\r" /* DSB equiv. on arm6*/ + : : "r" (0) : "memory" + ); +#elif defined __CPU_arm7 + /* drain store buffer: drain the per processor buffer into the L1 cache + making all the changes visible to other processors */ + asm volatile( "dsb \n\r" : : : "memory"); +#endif /* __CPU_arm6 / __CPU_arm7 */ #elif defined(__CPU_ppc) || defined(__CPU_ppc64) asm volatile( /* "sync\n\t" lwsync is faster and will work

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011