sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

git:master:159a81aa: carrierroute: renamed cr.dump to cr.dump_routes to preserve better old command name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 159a81aa28895a218466eb5f4d9de8fd510fc30c URL: https://github.com/kamailio/kamailio/commit/159a81aa28895a218466eb5f4d9de8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-23T09:37:41+01:00 carrierroute: renamed cr.dump to cr.dump_routes to preserve better old command name --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/cr_fifo.c Modified: src/modules/carrierroute/cr_fifo.h --- Diff: https://github.com/kamailio/kamailio/commit/159a81aa28895a218466eb5f4d9de8f… Patch: https://github.com/kamailio/kamailio/commit/159a81aa28895a218466eb5f4d9de8f… --- diff --git a/src/modules/carrierroute/carrierroute.c b/src/modules/carrierroute/carrierroute.c index 19934dd..3b260fe 100644 --- a/src/modules/carrierroute/carrierroute.c +++ b/src/modules/carrierroute/carrierroute.c @@ -319,12 +319,12 @@ static void rpc_cr_reload_routes(rpc_t *rpc, void *c) { } } -static const char *cr_rpc_dump_doc[2] = { +static const char *cr_rpc_dump_routes_doc[2] = { "Dump routes", 0 }; static rpc_export_t rpc_methods[] = { { "cr.reload_routes", rpc_cr_reload_routes, rpc_cr_reload_routes_doc, 0}, - { "cr.dump", cr_rpc_dump, cr_rpc_dump_doc, 0}, + { "cr.dump_routes", cr_rpc_dump_routes, cr_rpc_dump_routes_doc, 0}, {0, 0, 0, 0} }; diff --git a/src/modules/carrierroute/cr_fifo.c b/src/modules/carrierroute/cr_fifo.c index be0862b..ca5b6eb 100644 --- a/src/modules/carrierroute/cr_fifo.c +++ b/src/modules/carrierroute/cr_fifo.c @@ -1143,7 +1143,7 @@ static int cr_rpc_dump_tree_recursor (rpc_t* rpc, void* ctx, void *gh, * @param rpc - RPC API structure * @param ctx - RPC context */ -void cr_rpc_dump(rpc_t* rpc, void* ctx) +void cr_rpc_dump_routes(rpc_t* rpc, void* ctx) { struct route_data_t * rd; str *tmp_str; diff --git a/src/modules/carrierroute/cr_fifo.h b/src/modules/carrierroute/cr_fifo.h index 140dcb7..33916ea 100644 --- a/src/modules/carrierroute/cr_fifo.h +++ b/src/modules/carrierroute/cr_fifo.h @@ -138,5 +138,5 @@ struct mi_root* add_host (struct mi_root* cmd_tree, void *param); struct mi_root* delete_host (struct mi_root* cmd_tree, void * param); -void cr_rpc_dump(rpc_t* rpc, void* ctx); +void cr_rpc_dump_routes(rpc_t* rpc, void* ctx); #endif

8 years

git:master:58dfb86f: carrierroute: implemented cr.dump command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 58dfb86f6dd5619a5c545733f592ce3b71105464 URL: https://github.com/kamailio/kamailio/commit/58dfb86f6dd5619a5c545733f592ce3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-23T09:29:04+01:00 carrierroute: implemented cr.dump command --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/cr_fifo.c Modified: src/modules/carrierroute/cr_fifo.h --- Diff: https://github.com/kamailio/kamailio/commit/58dfb86f6dd5619a5c545733f592ce3… Patch: https://github.com/kamailio/kamailio/commit/58dfb86f6dd5619a5c545733f592ce3…

8 years

git:master:11980eff: websocket: implemented ws.enable and ws.disable rpc commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 11980eff7b72e05d400a0c9b865e12bd8c4d3762 URL: https://github.com/kamailio/kamailio/commit/11980eff7b72e05d400a0c9b865e12b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-22T21:44:10+01:00 websocket: implemented ws.enable and ws.disable rpc commands --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_handshake.c Modified: src/modules/websocket/ws_handshake.h --- Diff: https://github.com/kamailio/kamailio/commit/11980eff7b72e05d400a0c9b865e12b… Patch: https://github.com/kamailio/kamailio/commit/11980eff7b72e05d400a0c9b865e12b… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index abfd127..7f885e3 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -382,11 +382,23 @@ static const char* ws_rpc_pong_doc[2] = { 0 }; +static const char* ws_rpc_enable_doc[2] = { + "Enable websocket connection handling", + 0 +}; + +static const char* ws_rpc_disable_doc[2] = { + "Disable websocket connection handling", + 0 +}; + rpc_export_t ws_rpc_cmds[] = { {"ws.dump", ws_rpc_dump, ws_rpc_dump_doc, 0}, {"ws.close", ws_rpc_close, ws_rpc_close_doc, 0}, {"ws.ping", ws_rpc_ping, ws_rpc_ping_doc, 0}, {"ws.pong", ws_rpc_pong, ws_rpc_pong_doc, 0}, + {"ws.enable", ws_rpc_enable, ws_rpc_enable_doc, 0}, + {"ws.disable", ws_rpc_disable, ws_rpc_disable_doc, 0}, {0, 0, 0, 0} }; diff --git a/src/modules/websocket/ws_handshake.c b/src/modules/websocket/ws_handshake.c index 7d547e5..c931fa2 100644 --- a/src/modules/websocket/ws_handshake.c +++ b/src/modules/websocket/ws_handshake.c @@ -460,3 +460,17 @@ struct mi_root *ws_mi_enable(struct mi_root *cmd, void *param) LM_WARN("enabling websockets\n"); return init_mi_tree(200, MI_OK_S, MI_OK_LEN); } + +void ws_rpc_disable(rpc_t* rpc, void* ctx) +{ + cfg_get(websocket, ws_cfg, enabled) = 0; + LM_WARN("disabling websockets - new connections will be dropped\n"); + return; +} + +void ws_rpc_enable(rpc_t* rpc, void* ctx) +{ + cfg_get(websocket, ws_cfg, enabled) = 1; + LM_WARN("enabling websockets\n"); + return; +} diff --git a/src/modules/websocket/ws_handshake.h b/src/modules/websocket/ws_handshake.h index 9c244a1..521a91e 100644 --- a/src/modules/websocket/ws_handshake.h +++ b/src/modules/websocket/ws_handshake.h @@ -28,6 +28,7 @@ #define _WS_HANDSHAKE_H #include "../../core/sr_module.h" +#include "../../core/rpc.h" #include "../../core/parser/msg_parser.h" #include "websocket.h" @@ -49,4 +50,7 @@ int ws_handle_handshake(struct sip_msg *msg); struct mi_root *ws_mi_disable(struct mi_root *cmd, void *param); struct mi_root *ws_mi_enable(struct mi_root *cmd, void *param); +void ws_rpc_disable(rpc_t* rpc, void* ctx); +void ws_rpc_enable(rpc_t* rpc, void* ctx); + #endif /* _WS_HANDSHAKE_H */

8 years

git:master:bca64f79: websocket: implemented ws.dump rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bca64f794dba63acde941bd3fb0c012d16a0733c URL: https://github.com/kamailio/kamailio/commit/bca64f794dba63acde941bd3fb0c012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-22T16:59:36+01:00 websocket: implemented ws.dump rpc command --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h --- Diff: https://github.com/kamailio/kamailio/commit/bca64f794dba63acde941bd3fb0c012… Patch: https://github.com/kamailio/kamailio/commit/bca64f794dba63acde941bd3fb0c012…

8 years

git:master:2f2bf30e: websocket: implemented ws.ping and ws.pong rpc commands

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2f2bf30e4b30fef3849e9e83f7694af7b4f9c10e URL: https://github.com/kamailio/kamailio/commit/2f2bf30e4b30fef3849e9e83f7694af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-22T16:12:41+01:00 websocket: implemented ws.ping and ws.pong rpc commands --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.c Modified: src/modules/websocket/ws_frame.h --- Diff: https://github.com/kamailio/kamailio/commit/2f2bf30e4b30fef3849e9e83f7694af… Patch: https://github.com/kamailio/kamailio/commit/2f2bf30e4b30fef3849e9e83f7694af… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index af536e4..a1a23cf 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -367,9 +367,20 @@ static const char* ws_rpc_close_doc[2] = { 0 }; +static const char* ws_rpc_ping_doc[2] = { + "Send ping on a websocket connection by id", + 0 +}; + +static const char* ws_rpc_pong_doc[2] = { + "Send pong on a websocket connection by id", + 0 +}; + rpc_export_t ws_rpc_cmds[] = { - {"ws.close", ws_rpc_close, - ws_rpc_close_doc, 0}, + {"ws.close", ws_rpc_close, ws_rpc_close_doc, 0}, + {"ws.ping", ws_rpc_ping, ws_rpc_ping_doc, 0}, + {"ws.pong", ws_rpc_pong, ws_rpc_pong_doc, 0}, {0, 0, 0, 0} }; diff --git a/src/modules/websocket/ws_conn.h b/src/modules/websocket/ws_conn.h index 7729c00..f66a97d 100644 --- a/src/modules/websocket/ws_conn.h +++ b/src/modules/websocket/ws_conn.h @@ -99,5 +99,4 @@ int wsconn_put(ws_connection_t *wsc); ws_connection_t **wsconn_get_list(void); int wsconn_put_list(ws_connection_t **list); struct mi_root *ws_mi_dump(struct mi_root *cmd, void *param); -void ws_rpc_close(rpc_t* rpc, void* ctx); #endif /* _WS_CONN_H */ diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 5f1257a..eefd510 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -1124,3 +1124,45 @@ void ws_rpc_close(rpc_t* rpc, void* ctx) return; } } + +void ws_rpc_ping_pong(rpc_t* rpc, void* ctx, int opcode) +{ + unsigned int id; + ws_connection_t *wsc; + int ret = 0; + + if(rpc->scan(ctx, "d", (int*)(&id))<1) + { + LM_WARN("no connection ID parameter\n"); + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + + if ((wsc = wsconn_get(id)) == NULL) + { + LM_WARN("bad connection ID parameter\n"); + rpc->fault(ctx, 500, "Unknown connection ID"); + return; + } + + ret = ping_pong(wsc, opcode); + + wsconn_put(wsc); + + if (ret < 0) + { + LM_WARN("sending %s\n", OPCODE_PING ? "Ping" : "Pong"); + rpc->fault(ctx, 500, str_status_error_sending.s); + return; + } +} + +void ws_rpc_ping(rpc_t* rpc, void* ctx) +{ + ws_rpc_ping_pong(rpc, ctx, OPCODE_PING); +} + +void ws_rpc_pong(rpc_t* rpc, void* ctx) +{ + ws_rpc_ping_pong(rpc, ctx, OPCODE_PONG); +} diff --git a/src/modules/websocket/ws_frame.h b/src/modules/websocket/ws_frame.h index e5d2cb0..eefe9cb 100644 --- a/src/modules/websocket/ws_frame.h +++ b/src/modules/websocket/ws_frame.h @@ -30,6 +30,7 @@ #include "../../core/config.h" #include "../../core/sr_module.h" #include "../../core/str.h" +#include "../../core/rpc.h" #include "../../lib/kmi/tree.h" #include "ws_conn.h" @@ -80,4 +81,8 @@ int ws_close(sip_msg_t *msg); int ws_close2(sip_msg_t *msg, char *_status, char *_reason); int ws_close3(sip_msg_t *msg, char *_status, char *_reason, char *_con); +void ws_rpc_close(rpc_t* rpc, void* ctx); +void ws_rpc_ping(rpc_t* rpc, void* ctx); +void ws_rpc_pong(rpc_t* rpc, void* ctx); + #endif /* _WS_FRAME_H */

8 years

[kamailio/kamailio] db_postgres build failed on ubuntu 16.04 (#887)

by dugugang123

CC (gcc) [M db_postgres.so] pg_cmd.o CC (gcc) [M db_postgres.so] km_res.o CC (gcc) [M db_postgres.so] pg_uri.o CC (gcc) [M db_postgres.so] pg_fld.o make[2]: 'libsrdb2.so.1.0' is up to date. make[2]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_postgres.so] db_postgres.so /usr/bin/ld: 当搜索用于 /usr/lib/x86_64-linux-gnu/libpq.so 时跳过不兼容的 -lpq /usr/bin/ld: 当搜索用于 /usr/lib/x86_64-linux-gnu/libpq.a 时跳过不兼容的 -lpq /usr/bin/ld: 找不到 -lpq /usr/bin/ld: 当搜索用于 /usr/lib/x86_64-linux-gnu/libc.so 时跳过不兼容的 -lc /usr/bin/ld: 当搜索用于 /usr/lib/x86_64-linux-gnu/libc.a 时跳过不兼容的 -lc collect2: error: ld returned 1 exit status ../../Makefile.rules:188: recipe for target 'db_postgres.so' failed make[1]: *** [db_postgres.so] Error 1 Makefile:511: recipe for target 'modules' failed make: *** [modules] Error 1 -- 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/issues/887

8 years

git:4.4:2250b3e5: rtjson: enforce send socket with the attribute from json

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 2250b3e562d6dbcab1477c7ed5a71daa7e462bb9 URL: https://github.com/kamailio/kamailio/commit/2250b3e562d6dbcab1477c7ed5a71da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-22T09:15:22+01:00 rtjson: enforce send socket with the attribute from json - reported by Diego Nadares (backport of 1d23f81353dd7a68b0f537e9a064587a5f733bb7) --- Modified: modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/2250b3e562d6dbcab1477c7ed5a71da… Patch: https://github.com/kamailio/kamailio/commit/2250b3e562d6dbcab1477c7ed5a71da… --- diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index 60bdcad..5a21599 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -318,6 +318,7 @@ int rtjson_init_serial(sip_msg_t *msg, srjson_doc_t *jdoc, sr_xavp_t *iavp) str val; unsigned int bflags = 0; unsigned int old_bflags = 0; + struct socket_info* fsocket = NULL; tj = srjson_GetObjectItem(jdoc, jdoc->root, "routes"); if(tj==NULL || tj->type!=srjson_Array || tj->child==NULL) { @@ -370,6 +371,17 @@ int rtjson_init_serial(sip_msg_t *msg, srjson_doc_t *jdoc, sr_xavp_t *iavp) } } + rj = srjson_GetObjectItem(jdoc, nj, "socket"); + if(rj!=NULL && rj->type==srjson_String && rj->valuestring!=NULL) { + val.s = rj->valuestring; + val.len = strlen(val.s); + LM_DBG("trying to set send socket to: [%.*s]\n", val.len, val.s); + fsocket = lookup_local_socket(&val); + if(fsocket) { + set_force_socket(msg, fsocket); + } + } + rj = srjson_GetObjectItem(jdoc, nj, "branch_flags"); if(rj!=NULL && rj->type==srjson_Number && SRJSON_GET_UINT(rj)!=0) { bflags = SRJSON_GET_UINT(rj); @@ -498,6 +510,7 @@ int rtjson_append_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) str uri = {0}; str duri = {0}; str path = {0}; + str socket = {0}; struct socket_info* fsocket = NULL; unsigned int bflags = 0; @@ -519,7 +532,12 @@ int rtjson_append_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) path.s = rj->valuestring; path.len = strlen(path.s); } - + rj = srjson_GetObjectItem(jdoc, nj, "socket"); + if(rj!=NULL && rj->type==srjson_String && rj->valuestring!=NULL) { + socket.s = rj->valuestring; + socket.len = strlen(socket.s); + fsocket = lookup_local_socket(&socket); + } if (append_branch(msg, &uri, &duri, &path, 0, bflags, fsocket, 0 /*instance*/, 0, 0, 0) <0) {

8 years

git:master:1d23f813: rtjson: enforce send socket with the attribute from json

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1d23f81353dd7a68b0f537e9a064587a5f733bb7 URL: https://github.com/kamailio/kamailio/commit/1d23f81353dd7a68b0f537e9a064587… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-22T09:10:50+01:00 rtjson: enforce send socket with the attribute from json - reported by Diego Nadares --- Modified: src/modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/1d23f81353dd7a68b0f537e9a064587… Patch: https://github.com/kamailio/kamailio/commit/1d23f81353dd7a68b0f537e9a064587… --- diff --git a/src/modules/rtjson/rtjson_routing.c b/src/modules/rtjson/rtjson_routing.c index 9a12c75..6a44b82 100644 --- a/src/modules/rtjson/rtjson_routing.c +++ b/src/modules/rtjson/rtjson_routing.c @@ -318,6 +318,7 @@ int rtjson_init_serial(sip_msg_t *msg, srjson_doc_t *jdoc, sr_xavp_t *iavp) str val; unsigned int bflags = 0; unsigned int old_bflags = 0; + struct socket_info* fsocket = NULL; tj = srjson_GetObjectItem(jdoc, jdoc->root, "routes"); if(tj==NULL || tj->type!=srjson_Array || tj->child==NULL) { @@ -370,6 +371,17 @@ int rtjson_init_serial(sip_msg_t *msg, srjson_doc_t *jdoc, sr_xavp_t *iavp) } } + rj = srjson_GetObjectItem(jdoc, nj, "socket"); + if(rj!=NULL && rj->type==srjson_String && rj->valuestring!=NULL) { + val.s = rj->valuestring; + val.len = strlen(val.s); + LM_DBG("trying to set send socket to: [%.*s]\n", val.len, val.s); + fsocket = lookup_local_socket(&val); + if(fsocket) { + set_force_socket(msg, fsocket); + } + } + rj = srjson_GetObjectItem(jdoc, nj, "branch_flags"); if(rj!=NULL && rj->type==srjson_Number && SRJSON_GET_UINT(rj)!=0) { bflags = SRJSON_GET_UINT(rj); @@ -498,6 +510,7 @@ int rtjson_append_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) str uri = {0}; str duri = {0}; str path = {0}; + str socket = {0}; struct socket_info* fsocket = NULL; unsigned int bflags = 0; @@ -519,7 +532,12 @@ int rtjson_append_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) path.s = rj->valuestring; path.len = strlen(path.s); } - + rj = srjson_GetObjectItem(jdoc, nj, "socket"); + if(rj!=NULL && rj->type==srjson_String && rj->valuestring!=NULL) { + socket.s = rj->valuestring; + socket.len = strlen(socket.s); + fsocket = lookup_local_socket(&socket); + } if (append_branch(msg, &uri, &duri, &path, 0, bflags, fsocket, 0 /*instance*/, 0, 0, 0) <0) {

8 years

git:master:4263617a: websocket: implemented ws.close rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4263617ad2f8dfb6204bc615f077f411f0b22835 URL: https://github.com/kamailio/kamailio/commit/4263617ad2f8dfb6204bc615f077f41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-22T08:09:17+01:00 websocket: implemented ws.close rpc command --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/4263617ad2f8dfb6204bc615f077f41… Patch: https://github.com/kamailio/kamailio/commit/4263617ad2f8dfb6204bc615f077f41…

8 years

[kamailio/kamailio] http_async_client: ensure username and password initialized (#897)

by Giacomo Vacca

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/897 -- Commit Summary -- * http_async_client: ensure username and password initialized -- File Changes -- M src/modules/http_async_client/async_http.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/897.patch https://github.com/kamailio/kamailio/pull/897.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/897

8 years

← Newer
1
...
6
7
8
9
10
11
12
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016