sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
250 discussions

git:pd/websocket: modules/websocket: More tidying up

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 76f15b97d60b0e1c2c22fabc6c7310b33ad80742 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76f15b9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 21 17:37:08 2012 +0100 modules/websocket: More tidying up --- modules/websocket/ws_conn.c | 8 ++++---- modules/websocket/ws_mod.c | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 5f5dcf9..ba3dcc8 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -31,10 +31,10 @@ gen_lock_t *wsconn_lock = NULL; char *wsconn_state_str[] = { - "CONNECTING", - "OPEN", - "CLOSING", - "CLOSED" + "CONNECTING", /* WS_S_CONNECTING */ + "OPEN", /* WS_S_OPEN */ + "CLOSING", /* WS_S_CLOSING */ + "CLOSED" /* WS_S_CLOSED */ }; static inline void _wsconn_rm(ws_connection_t *wsc); diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 5f5c67b..46fc5d0 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -39,6 +39,9 @@ MODULE_VERSION +/* Maximum number of connections to display when using the ws.dump MI command */ +#define MAX_WS_CONNS_DUMP 50 + extern gen_lock_t *tcpconn_lock; extern struct tcp_connection **tcpconn_id_hash; @@ -197,7 +200,7 @@ static void destroy(void) static struct mi_root *mi_dump(struct mi_root *cmd, void *param) { - int h, connections = 0, interval; + int h, connections = 0, truncated = 0, interval; char *src_proto, *dst_proto; char src_ip[IP6_MAX_STR_SIZE + 1], dst_ip[IP6_MAX_STR_SIZE + 1]; ws_connection_t *wsc; @@ -243,7 +246,11 @@ static struct mi_root *mi_dump(struct mi_root *cmd, void *param) interval) == 0) return 0; - connections++; + if (++connections == MAX_WS_CONNS_DUMP) + { + truncated = 1; + break; + } } wsc = wsc->next; @@ -252,8 +259,9 @@ static struct mi_root *mi_dump(struct mi_root *cmd, void *param) WSCONN_UNLOCK; if (addf_mi_node_child(&rpl_tree->node, 0, 0, 0, - "%d WebSocket connection%s found", - connections, connections == 1 ? "" : "s") == 0) + "%d WebSocket connection%s found%s", + connections, connections == 1 ? "" : "s", + truncated == 1 ? "(truncated)" : "") == 0) return 0; return rpl_tree;

11 years, 10 months

git:pd/websocket: modules/websocket: fixed typo

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 2af2b3277a8b9fb46c5fa9a5ce38eea072a22663 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2af2b32… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 21 16:58:05 2012 +0100 modules/websocket: fixed typo --- modules/websocket/ws_frame.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 50c3fd2..4ace675 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -31,7 +31,7 @@ #include "ws_frame.h" #include "ws_mod.h" -/* 0 1 2 3 +/* 0 1 2 3 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 +-+-+-+-+-------+-+-------------+-------------------------------+ |F|R|R|R| opcode|M| Payload len | Extended payload length |

11 years, 10 months

git:pd/websocket: modules/websockets: started adding WebSocket connection management to WebSocket module

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 857b117c5058200b57501868d5d29dab778fbd94 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=857b117… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 21 16:28:57 2012 +0100 modules/websockets: started adding WebSocket connection management to WebSocket module --- modules/websocket/ws_conn.c | 187 ++++++++++++++++++++++++++++++++++++++ modules/websocket/ws_conn.h | 63 +++++++++++++ modules/websocket/ws_frame.c | 2 + modules/websocket/ws_handshake.c | 7 +- modules/websocket/ws_mod.c | 84 +++++++++++------ 5 files changed, 310 insertions(+), 33 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=857…

11 years, 10 months

git:pd/websocket: modules/websocket: Added connection close code and tidied up MI commands

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 7d35945ec66caa286db66cd55ef56c78f29c434c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d35945… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 21 13:50:53 2012 +0100 modules/websocket: Added connection close code and tidied up MI commands --- modules/websocket/ws_frame.c | 14 ++++++++------ modules/websocket/ws_mod.c | 41 +++++++++++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index fba01f5..4e36b59 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -202,7 +202,7 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame) return frame->opcode; } -static int encode_and_send_ws_frame(ws_frame_t *frame) +static int encode_and_send_ws_frame(ws_frame_t *frame, int conn_close) { int pos = 0, extended_length; unsigned int frame_length; @@ -291,6 +291,8 @@ static int encode_and_send_ws_frame(ws_frame_t *frame) memcpy(&send_buf[pos], frame->payload_data, frame->payload_len); init_dst_from_rcv(&dst, &frame->tcpinfo->con->rcv); + if (conn_close) dst.send_flags.f |= SND_F_CON_CLOSE; + if (tcp_send(&dst, NULL, send_buf, frame_length) < 0) { LM_ERR("sending WebSocket frame\n"); @@ -335,7 +337,9 @@ static int handle_close(ws_frame_t *frame) LM_INFO("Close: %hu %.*s\n", code, reason.len, reason.s); - /* TODO: cleanly close TCP/TLS connection */ + /* Close socket */ + frame->tcpinfo->con->state = S_CONN_BAD; + frame->tcpinfo->con->timeout = get_ticks_raw(); return 0; } @@ -347,7 +351,7 @@ static int handle_ping(ws_frame_t *frame) frame->opcode = OPCODE_PONG; frame->mask = 0; - encode_and_send_ws_frame(frame); + encode_and_send_ws_frame(frame, 0); return 0; } @@ -470,15 +474,13 @@ struct mi_root *ws_mi_close(struct mi_root *cmd, void *param) frame.payload_data = data; frame.tcpinfo = &tcpinfo; - if (encode_and_send_ws_frame(&frame) < 0) + if (encode_and_send_ws_frame(&frame, 1) < 0) { LM_ERR("sending WebSocket close\n"); pkg_free(data); return init_mi_tree(500,"Sending WebSocket close", 23); } - /* TODO: cleanly close TCP/TLS connection */ - update_stat(ws_local_closed_connections, 1); update_stat(ws_current_connections, -1); diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index 1bf1dc0..fb86069 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -91,12 +91,12 @@ static stat_export_t stats[] = static mi_export_t mi_cmds[] = { - { "ws_close", ws_mi_close, 0, 0, 0 }, - { "ws_disable", ws_mi_disable, 0, 0, 0 }, - { "ws_dump", mi_dump, 0, 0, 0 }, - { "ws_enable", ws_mi_enable, 0, 0, 0 }, - { "ws_ping", ws_mi_ping, 0, 0, 0 }, - { "ws_pong", ws_mi_pong, 0, 0, 0 }, + { "ws.close", ws_mi_close, 0, 0, 0 }, + { "ws.disable", ws_mi_disable, 0, 0, 0 }, + { "ws.dump", mi_dump, 0, 0, 0 }, + { "ws.enable", ws_mi_enable, 0, 0, 0 }, + { "ws.ping", ws_mi_ping, 0, 0, 0 }, + { "ws.pong", ws_mi_pong, 0, 0, 0 }, { 0, 0, 0, 0, 0 } }; @@ -181,6 +181,10 @@ static struct mi_root *mi_dump(struct mi_root *cmd, void *param) char *src_proto, *dst_proto; char src_ip[IP6_MAX_STR_SIZE + 1], dst_ip[IP6_MAX_STR_SIZE + 1]; struct tcp_connection *c; + struct mi_root *rpl_tree = init_mi_tree(200, MI_OK_S, MI_OK_LEN); + + if (!rpl_tree) + return 0; TCPCONN_LOCK; for (h = 0; h < TCP_ID_HASH_SIZE; h++) @@ -202,12 +206,18 @@ static struct mi_root *mi_dump(struct mi_root *cmd, void *param) ip_addr2sbuf(&c->rcv.dst_ip, src_ip, IP6_MAX_STR_SIZE); - LM_ERR("id - %d, " - "src - %s:%s:%hu, " - "dst - %s:%s:%hu\n", - c->id, - src_proto, src_ip, c->rcv.src_port, - dst_proto, dst_ip, c->rcv.dst_port); + if (addf_mi_node_child(&rpl_tree->node, 0, 0, 0, + "id - %d, " + "src - %s:%s:%hu, " + "dst - %s:%s:%hu", + c->id, + src_proto, + strlen(src_ip) ? src_ip : "*", + c->rcv.src_port, + dst_proto, + strlen(dst_ip) ? dst_ip : "*", + c->rcv.dst_port) == 0) + return 0; connections++; } @@ -217,7 +227,10 @@ static struct mi_root *mi_dump(struct mi_root *cmd, void *param) } TCPCONN_UNLOCK; - LM_ERR("%d WebSocket connections found\n", connections); + if (addf_mi_node_child(&rpl_tree->node, 0, 0, 0, + "%d WebSocket connection%s found", + connections, connections == 1 ? "" : "s") == 0) + return 0; - return init_mi_tree(200, MI_OK_S, MI_OK_LEN); + return rpl_tree; }

11 years, 10 months

New developer - Vicente Hernando

by Daniel-Constantin Mierla

Hello, I am introducing Vicente as a new registered developer - he submitted lately very useful patches to ndb_redis module (e.g., array support in replies, redis free function for config), new ones being on the pipe -- he can present better his plans or you just watch the commits. Mainly he will be in charge with ndb_redis module, being a heavy user of it, but there have been submissions from him to other parts of code, we welcome improvements and new good features anywhere! Welcome and looking forward to your contributions! Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Seattle, USA, Sep 23-26, 2012 - http://asipto.com/u/katu Kamailio Practical Workshop, Netherlands, Sep 10-12, 2012 - http://asipto.com/u/kpw

11 years, 10 months

git:master: ndb_redis: README file update for unix domain socket support.

by Vicente Hernando

Module: sip-router Branch: master Commit: a2f9844c01eb19d42d2a2864213c301c53f9b4ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a2f9844… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Wed Jun 20 21:08:19 2012 +0200 ndb_redis: README file update for unix domain socket support. --- modules/ndb_redis/README | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/ndb_redis/README b/modules/ndb_redis/README index f66c4db..7d72d58 100644 --- a/modules/ndb_redis/README +++ b/modules/ndb_redis/README @@ -96,9 +96,12 @@ Chapter 1. Admin Guide Specify the details to connect to REDIS server. It takes a list of attribute=value separated by semicolon, the attributes can be name, - addr, port and db. Name is a generic identifier to be used with module - functions. addr and port are the IP address and the port to connect to - REDIS server. db is the DB number to use (defaults to 0 if not + unix, addr, port and db. Name is a generic identifier to be used with + module functions. unix is the path to the unix domain socket provided + by redis server. addr and port are the IP address and the port to + connect to REDIS server. unix and (addr, port) are mutually exclusive. + If both appear in same server settings unix domain socket is + configured. db is the DB number to use (defaults to 0 if not specified). You can set this parameter many times, in case you want to connect to @@ -111,6 +114,9 @@ Chapter 1. Admin Guide ... modparam("ndb_redis", "server", "name=srvN;addr=127.0.0.1;port=6379;db=1") modparam("ndb_redis", "server", "name=srvX;addr=127.0.0.2;port=6379;db=4") + +# Unix domain socket +modparam("ndb_redis", "server", "name=srvY;unix=/tmp/redis.sock;db=3") ... 4. Functions

11 years, 10 months

git:master: ndb_redis: able to connect to redis server via unix domain socket.

by Vicente Hernando

Module: sip-router Branch: master Commit: b20f81a4efc43faed2656170f8b4108f897dffee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b20f81a… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Wed Jun 20 14:59:47 2012 -0400 ndb_redis: able to connect to redis server via unix domain socket. - added unix atribute in server modparam - unix attribute has higher precedence over address and port --- modules/ndb_redis/doc/ndb_redis_admin.xml | 13 ++++-- modules/ndb_redis/redis_client.c | 66 ++++++++++++++++++++++------- 2 files changed, 60 insertions(+), 19 deletions(-) diff --git a/modules/ndb_redis/doc/ndb_redis_admin.xml b/modules/ndb_redis/doc/ndb_redis_admin.xml index 11345c5..54d6788 100644 --- a/modules/ndb_redis/doc/ndb_redis_admin.xml +++ b/modules/ndb_redis/doc/ndb_redis_admin.xml @@ -64,10 +64,12 @@ <para> Specify the details to connect to REDIS server. It takes a list of attribute=value separated by semicolon, the attributes can be - name, addr, port and db. Name is a generic identifier to be used with - module functions. addr and port are the IP address and the port to - connect to REDIS server. db is the DB number to use (defaults to 0 if - not specified). + name, unix, addr, port and db. Name is a generic identifier to be used + with module functions. unix is the path to the unix domain socket provided + by redis server. addr and port are the IP address and the port to + connect to REDIS server. unix and (addr, port) are mutually exclusive. + If both appear in same server settings unix domain socket is configured. + db is the DB number to use (defaults to 0 if not specified). </para> <para> You can set this parameter many times, in case you want to connect to @@ -85,6 +87,9 @@ ... modparam("ndb_redis", "server", "name=srvN;addr=127.0.0.1;port=6379;db=1") modparam("ndb_redis", "server", "name=srvX;addr=127.0.0.2;port=6379;db=4") + +# Unix domain socket +modparam("ndb_redis", "server", "name=srvY;unix=/tmp/redis.sock;db=3") ... </programlisting> </example> diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 34d2314..ae97583 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -45,7 +45,7 @@ static redisc_reply_t *_redisc_rpl_list=NULL; */ int redisc_init(void) { - char *addr; + char *addr, *unix_sock_path = NULL; unsigned int port, db; redisc_server_t *rsrv=NULL; param_t *pit = NULL; @@ -67,7 +67,10 @@ int redisc_init(void) db = 0; for (pit = rsrv->attrs; pit; pit=pit->next) { - if(pit->name.len==4 && strncmp(pit->name.s, "addr", 4)==0) { + if(pit->name.len==4 && strncmp(pit->name.s, "unix", 4)==0) { + unix_sock_path = pit->body.s; + unix_sock_path[pit->body.len] = '\0'; + } else if(pit->name.len==4 && strncmp(pit->name.s, "addr", 4)==0) { addr = pit->body.s; addr[pit->body.len] = '\0'; } else if(pit->name.len==4 && strncmp(pit->name.s, "port", 4)==0) { @@ -78,7 +81,14 @@ int redisc_init(void) db = 0; } } - rsrv->ctxRedis = redisConnectWithTimeout(addr, port, tv); + + if(unix_sock_path != NULL) { + LM_DBG("Connecting to unix socket: %s\n", unix_sock_path); + rsrv->ctxRedis = redisConnectUnixWithTimeout(unix_sock_path, tv); + } else { + rsrv->ctxRedis = redisConnectWithTimeout(addr, port, tv); + } + if(!rsrv->ctxRedis) goto err; if (rsrv->ctxRedis->err) @@ -93,12 +103,22 @@ int redisc_init(void) return 0; err2: - LM_ERR("error communicating with redis server [%.*s] (%s:%d/%d): %s\n", - rsrv->sname->len, rsrv->sname->s, addr, port, db, rsrv->ctxRedis->errstr); + if (unix_sock_path != NULL) { + LM_ERR("error communicating with redis server [%.*s] (unix:%s db:%d): %s\n", + rsrv->sname->len, rsrv->sname->s, unix_sock_path, db, rsrv->ctxRedis->errstr); + } else { + LM_ERR("error communicating with redis server [%.*s] (%s:%d/%d): %s\n", + rsrv->sname->len, rsrv->sname->s, addr, port, db, rsrv->ctxRedis->errstr); + } return -1; err: - LM_ERR("failed to connect to redis server [%.*s] (%s:%d/%d)\n", - rsrv->sname->len, rsrv->sname->s, addr, port, db); + if (unix_sock_path != NULL) { + LM_ERR("failed to connect to redis server [%.*s] (unix:%s db:%d)\n", + rsrv->sname->len, rsrv->sname->s, unix_sock_path, db); + } else { + LM_ERR("failed to connect to redis server [%.*s] (%s:%d/%d)\n", + rsrv->sname->len, rsrv->sname->s, addr, port, db); + } return -1; } @@ -221,7 +241,7 @@ redisc_server_t *redisc_get_server(str *name) */ int redisc_reconnect_server(redisc_server_t *rsrv) { - char *addr; + char *addr, *unix_sock_path = NULL; unsigned int port, db; param_t *pit = NULL; struct timeval tv; @@ -233,7 +253,10 @@ int redisc_reconnect_server(redisc_server_t *rsrv) db = 0; for (pit = rsrv->attrs; pit; pit=pit->next) { - if(pit->name.len==4 && strncmp(pit->name.s, "addr", 4)==0) { + if(pit->name.len==4 && strncmp(pit->name.s, "unix", 4)==0) { + unix_sock_path = pit->body.s; + unix_sock_path[pit->body.len] = '\0'; + } else if(pit->name.len==4 && strncmp(pit->name.s, "addr", 4)==0) { addr = pit->body.s; addr[pit->body.len] = '\0'; } else if(pit->name.len==4 && strncmp(pit->name.s, "port", 4)==0) { @@ -249,7 +272,11 @@ int redisc_reconnect_server(redisc_server_t *rsrv) rsrv->ctxRedis = NULL; } - rsrv->ctxRedis = redisConnectWithTimeout(addr, port, tv); + if(unix_sock_path != NULL) { + rsrv->ctxRedis = redisConnectUnixWithTimeout(unix_sock_path, tv); + } else { + rsrv->ctxRedis = redisConnectWithTimeout(addr, port, tv); + } if(!rsrv->ctxRedis) goto err; if (rsrv->ctxRedis->err) @@ -262,12 +289,21 @@ int redisc_reconnect_server(redisc_server_t *rsrv) return 0; err2: - LM_ERR("error communicating with redis server [%.*s] (%s:%d/%d): %s\n", - rsrv->sname->len, rsrv->sname->s, addr, port, db, rsrv->ctxRedis->errstr); - return -1; + if (unix_sock_path != NULL) { + LM_ERR("error communicating with redis server [%.*s] (unix:%s db:%d): %s\n", + rsrv->sname->len, rsrv->sname->s, unix_sock_path, db, rsrv->ctxRedis->errstr); + } else { + LM_ERR("error communicating with redis server [%.*s] (%s:%d/%d): %s\n", + rsrv->sname->len, rsrv->sname->s, addr, port, db, rsrv->ctxRedis->errstr); + } err: - LM_ERR("failed to connect to redis server [%.*s] (%s:%d/%d)\n", - rsrv->sname->len, rsrv->sname->s, addr, port, db); + if (unix_sock_path != NULL) { + LM_ERR("failed to connect to redis server [%.*s] (unix:%s db:%d)\n", + rsrv->sname->len, rsrv->sname->s, unix_sock_path, db); + } else { + LM_ERR("failed to connect to redis server [%.*s] (%s:%d/%d)\n", + rsrv->sname->len, rsrv->sname->s, addr, port, db); + } return -1; }

11 years, 10 months

Kamailio v3.3.0 Released - new major version is out

by Daniel-Constantin Mierla

Kamailio v3.3.0 is out – a major release with a very large number of new features and improvements. This release is a result of about 6 months of development and 2 months of testing from the teams of Kamailio (OpenSER) and SIP Express Router (SER) projects. Version 3.3.0 comes with 7 brand new modules in addition to a lot of fresh features in core and old modules. You can read detailed release notes at: * http://www.kamailio.org/w/kamailio-v3-3-0-release-notes/ Many thanks to all developers and community members that made possible this release. Enjoy SIP routing in a secure, flexible and easier way with Kamailio v3.3.0! Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

11 years, 10 months

git:master: Disable keeping alive of dialog, if the dialog-api does not provide a dlg_flag.

by admin＠sip-router.org

Module: sip-router Branch: master Commit: b260b0ad1bb6c687ef00eb084357d337549ae2ec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b260b0a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Wed Jun 20 15:41:02 2012 +0200 Disable keeping alive of dialog, if the dialog-api does not provide a dlg_flag. --- modules_k/nat_traversal/nat_traversal.c | 56 +++++++++++++++---------------- 1 files changed, 27 insertions(+), 29 deletions(-) diff --git a/modules_k/nat_traversal/nat_traversal.c b/modules_k/nat_traversal/nat_traversal.c index 9877766..4c6f7b2 100644 --- a/modules_k/nat_traversal/nat_traversal.c +++ b/modules_k/nat_traversal/nat_traversal.c @@ -1741,38 +1741,36 @@ mod_init(void) // bind to the dialog API if (load_dlg_api(&dlg_api)==0) { - have_dlg_api = True; - // load dlg_flag and default_timeout parameters from the dialog module param = find_param_export(find_module_by_name("dialog"), "dlg_flag", INT_PARAM, &type); - if (!param) { - LM_ERR("cannot find dlg_flag parameter in the dialog module\n"); - return -1; - } - dialog_flag = *param; + if (param) { + have_dlg_api = True; - param = find_param_export(find_module_by_name("dialog"), - "default_timeout", INT_PARAM, &type); - if (!param) { - LM_ERR("cannot find default_timeout parameter in the dialog module\n"); - return -1; - } - dialog_default_timeout = *param; + dialog_flag = *param; - // register dialog creation callback - if (dlg_api.register_dlgcb(NULL, DLGCB_CREATED, __dialog_created, NULL, NULL) != 0) { - LM_ERR("cannot register callback for dialog creation\n"); - return -1; - } + param = find_param_export(find_module_by_name("dialog"), + "default_timeout", INT_PARAM, &type); + if (!param) { + LM_ERR("cannot find default_timeout parameter in the dialog module\n"); + return -1; + } + dialog_default_timeout = *param; - // register a pre-script callback to automatically enable dialog tracing - if (register_script_cb(preprocess_request, PRE_SCRIPT_CB|REQUEST_CB, 0)!=0) { - LM_ERR("could not register request preprocessing callback\n"); - return -1; - } + // register dialog creation callback + if (dlg_api.register_dlgcb(NULL, DLGCB_CREATED, __dialog_created, NULL, NULL) != 0) { + LM_ERR("cannot register callback for dialog creation\n"); + return -1; + } - } else { + // register a pre-script callback to automatically enable dialog tracing + if (register_script_cb(preprocess_request, PRE_SCRIPT_CB|REQUEST_CB, 0)!=0) { + LM_ERR("could not register request preprocessing callback\n"); + return -1; + } + } + } + if (!have_dlg_api) { LM_NOTICE("keeping alive dialogs is disabled because the dialog module is not loaded\n"); }

11 years, 10 months

[tracker] Comment added: Kamailio does not handle HTTP Via: headers in requests and responses

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#237 - Kamailio does not handle HTTP Via: headers in requests and responses User who did this - Daniel-Constantin Mierla (miconda) ---------- Btw, the sip via was ignored so far by the http clients, not sure what happens in the http proxies ... Not getting the parsing error is probably higher priority, fortunately looks easy enough. And it just came in my mind, we can hook up in the core for sent replies and replace '\nVia:' with other same-size-and-format token if it is HTTP. Something similar does topoh to hide the SIP sensitive headers. But it is not really that clean, the hook callback impacting all replies, including SIP (even if not replaced, it will be some extra check to detect is sip vs http). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=237#comment697 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.

11 years, 10 months

← Newer
1
...
4
5
6
7
8
9
10
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012