sr-dev

sr-dev@lists.kamailio.org

3 participants
45197 discussions

[kamailio/kamailio] KSR.is_MESSAGE() Not implemented (#2331)
by hance2010 18 May '20

18 May '20

### Description KSR.is_MESSAGE() Not implemented. kamailio v5.3.4  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2331

2 2

git:master:8db5a12f: core: kemi - added missing is_MESSAGE()
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 8db5a12f7fab1a1fc7d50c87bbf1aee325b067c2 URL: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-18T08:29:09+02:00 core: kemi - added missing is_MESSAGE() - GH #2331 --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… Patch: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 8a77c227b7..7a5ba1068d 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1057,6 +1057,16 @@ static int sr_kemi_core_is_method_prack(sip_msg_t *msg) return sr_kemi_core_is_method_type(msg, METHOD_PRACK); } + +/** + * + */ +static int sr_kemi_core_is_method_message(sip_msg_t *msg) +{ + return sr_kemi_core_is_method_type(msg, METHOD_MESSAGE); +} + + /** * */ @@ -1740,6 +1750,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_MESSAGE"), + SR_KEMIP_BOOL, sr_kemi_core_is_method_message, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_UDP"), SR_KEMIP_BOOL, sr_kemi_core_is_proto_udp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:7749069c: uid_uri_db: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 7749069cd05b9619ee32237773097441e241bac4 URL: https://github.com/kamailio/kamailio/commit/7749069cd05b9619ee3223777309744… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:01:18+02:00 uid_uri_db: use file specific include guard --- Modified: src/modules/uid_uri_db/uid_uri_db_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/7749069cd05b9619ee3223777309744… Patch: https://github.com/kamailio/kamailio/commit/7749069cd05b9619ee3223777309744… --- diff --git a/src/modules/uid_uri_db/uid_uri_db_mod.h b/src/modules/uid_uri_db/uid_uri_db_mod.h index e4848ecd93..aa72a2aa5b 100644 --- a/src/modules/uid_uri_db/uid_uri_db_mod.h +++ b/src/modules/uid_uri_db/uid_uri_db_mod.h @@ -27,8 +27,8 @@ */ -#ifndef URIDB_MOD_H -#define URIDB_MOD_H +#ifndef _UID_URI_DB_MOD_H_ +#define _UID_URI_DB_MOD_H_ #include "../../lib/srdb2/db.h" #include "../../core/str.h"

1 0

git:master:3d73e8cb: acc_diameter: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 3d73e8cb9f7431383c5a4ce798e2610f37ff92dc URL: https://github.com/kamailio/kamailio/commit/3d73e8cb9f7431383c5a4ce798e2610… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:00:28+02:00 acc_diameter: use file specific include guard --- Modified: src/modules/acc_diameter/diam_message.h --- Diff: https://github.com/kamailio/kamailio/commit/3d73e8cb9f7431383c5a4ce798e2610… Patch: https://github.com/kamailio/kamailio/commit/3d73e8cb9f7431383c5a4ce798e2610… --- diff --git a/src/modules/acc_diameter/diam_message.h b/src/modules/acc_diameter/diam_message.h index 9051f0f7a1..7ca1caf27e 100644 --- a/src/modules/acc_diameter/diam_message.h +++ b/src/modules/acc_diameter/diam_message.h @@ -26,8 +26,8 @@ * - Module: \ref acc */ -#ifndef _AAA_DIAMETER_MSG_H -#define _AAA_DIAMETER_MSG_H +#ifndef _ACC_DIAM_MESSAGE_H_ +#define _ACC_DIAM_MESSAGE_H_ #include "../../core/str.h" #include "../../core/mem/mem.h"

1 0

git:master:9053c70f: auth_diameter: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 9053c70fe7e147b784c53a57014796282701c74d URL: https://github.com/kamailio/kamailio/commit/9053c70fe7e147b784c53a570147962… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:01:00+02:00 auth_diameter: use file specific include guard --- Modified: src/modules/auth_diameter/diameter_msg.h --- Diff: https://github.com/kamailio/kamailio/commit/9053c70fe7e147b784c53a570147962… Patch: https://github.com/kamailio/kamailio/commit/9053c70fe7e147b784c53a570147962… --- diff --git a/src/modules/auth_diameter/diameter_msg.h b/src/modules/auth_diameter/diameter_msg.h index 7ab5a8c383..e8e7eea875 100644 --- a/src/modules/auth_diameter/diameter_msg.h +++ b/src/modules/auth_diameter/diameter_msg.h @@ -13,15 +13,15 @@ * 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 + * 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 */ -#ifndef _AAA_DIAMETER_MSG_H -#define _AAA_DIAMETER_MSG_H +#ifndef _AUTH_DIAM_MESSAGE_H_ +#define _AUTH_DIAM_MESSAGE_H_ #include "../../core/str.h" #include "../../core/mem/mem.h"

1 0

git:master:d26ccdea: core: define macro for signature to be used for server and user-agent
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: d26ccdea61230bfc7720a2523c7b6dd8d2692d6d URL: https://github.com/kamailio/kamailio/commit/d26ccdea61230bfc7720a2523c7b6dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T15:20:45+02:00 core: define macro for signature to be used for server and user-agent --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/d26ccdea61230bfc7720a2523c7b6dd… Patch: https://github.com/kamailio/kamailio/commit/d26ccdea61230bfc7720a2523c7b6dd… --- diff --git a/src/core/config.h b/src/core/config.h index 63ff8dc26c..e35fd6daba 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -79,12 +79,15 @@ #define CONTENT_LENGTH "Content-Length: " #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1) -#define USER_AGENT "User-Agent: " NAME \ +#define SRVAPP_SIGNATURE NAME \ " (" VERSION " (" ARCH "/" OS_QUOTED "))" +#define SRVAPP_SIGNATURE_LEN (sizeof(SRVAPP_SIGNATURE)-1) + + +#define USER_AGENT "User-Agent: " SRVAPP_SIGNATURE #define USER_AGENT_LEN (sizeof(USER_AGENT)-1) -#define SERVER_HDR "Server: " NAME \ - " (" VERSION " (" ARCH "/" OS_QUOTED "))" +#define SERVER_HDR "Server: " SRVAPP_SIGNATURE #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) #define MAX_WARNING_LEN 256

1 0

git:master:c0e687d8: websocket: use signature macro instead of offsetting inside server hdr define
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: c0e687d820f9bbf2b6b1ef6892e5b34c30f25a63 URL: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T15:21:43+02:00 websocket: use signature macro instead of offsetting inside server hdr define - pass rcv info structure by address - remove function name from logs --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.h Modified: src/modules/websocket/ws_handshake.c --- Diff: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… Patch: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 87cf4e3a5f..5cef5d6b1a 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -210,8 +210,8 @@ static int mod_init(void) } if(ws_ping_application_data.len < 1 || ws_ping_application_data.len > 125) { - ws_ping_application_data.s = DEFAULT_PING_APPLICATION_DATA + 8; - ws_ping_application_data.len = DEFAULT_PING_APPLICATION_DATA_LEN - 8; + ws_ping_application_data.s = DEFAULT_PING_APPLICATION_DATA; + ws_ping_application_data.len = DEFAULT_PING_APPLICATION_DATA_LEN; } if(ws_keepalive_mechanism != KEEPALIVE_MECHANISM_NONE) { diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index a4442ae0d8..8570afa086 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -184,14 +184,14 @@ void wsconn_destroy(void) } } -int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) +int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol) { int cur_cons, max_cons; - int id = rcv.proto_reserved1; + int id = rcv->proto_reserved1; int id_hash = tcp_id_hash(id); ws_connection_t *wsc; - LM_DBG("wsconn_add id [%d]\n", id); + LM_DBG("connection id [%d]\n", id); /* Allocate and fill in new WebSocket connection */ wsc = shm_malloc(sizeof(ws_connection_t) + BUF_SIZE + 1); @@ -203,13 +203,13 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) wsc->id = id; wsc->id_hash = id_hash; wsc->state = WS_S_OPEN; - wsc->rcv = rcv; + wsc->rcv = *rcv; wsc->sub_protocol = sub_protocol; wsc->run_event = 0; wsc->frag_buf.s = ((char *)wsc) + sizeof(ws_connection_t); atomic_set(&wsc->refcnt, 0); - LM_DBG("wsconn_add new wsc => [%p], ref => [%d]\n", wsc, + LM_DBG("new wsc => [%p], ref => [%d]\n", wsc, atomic_get(&wsc->refcnt)); WSCONN_LOCK; @@ -229,7 +229,7 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) WSCONN_UNLOCK; - LM_DBG("wsconn_add added to conn_table wsc => [%p], ref => [%d]\n", wsc, + LM_DBG("added to conn_table wsc => [%p], ref => [%d]\n", wsc, atomic_get(&wsc->refcnt)); /* Update connection statistics */ diff --git a/src/modules/websocket/ws_conn.h b/src/modules/websocket/ws_conn.h index 9319238e4d..f8aa93543c 100644 --- a/src/modules/websocket/ws_conn.h +++ b/src/modules/websocket/ws_conn.h @@ -95,7 +95,7 @@ extern stat_var *ws_msrp_max_concurrent_connections; int wsconn_init(void); void wsconn_destroy(void); -int wsconn_add(struct receive_info rcv, unsigned int sub_protocol); +int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol); int wsconn_rm(ws_connection_t *wsc, ws_conn_eventroute_t run_event_route); int wsconn_update(ws_connection_t *wsc); void wsconn_close_now(ws_connection_t *wsc); diff --git a/src/modules/websocket/ws_frame.h b/src/modules/websocket/ws_frame.h index d0f8d84ed0..51a62e04c8 100644 --- a/src/modules/websocket/ws_frame.h +++ b/src/modules/websocket/ws_frame.h @@ -49,8 +49,8 @@ extern int ws_keepalive_mechanism; #define DEFAULT_KEEPALIVE_TIMEOUT 180 /* seconds */ extern str ws_ping_application_data; -#define DEFAULT_PING_APPLICATION_DATA SERVER_HDR -#define DEFAULT_PING_APPLICATION_DATA_LEN SERVER_HDR_LEN +#define DEFAULT_PING_APPLICATION_DATA SRVAPP_SIGNATURE +#define DEFAULT_PING_APPLICATION_DATA_LEN SRVAPP_SIGNATURE_LEN extern stat_var *ws_failed_connections; extern stat_var *ws_local_closed_connections; diff --git a/src/modules/websocket/ws_handshake.c b/src/modules/websocket/ws_handshake.c index 58e6077bb5..878c483f2a 100644 --- a/src/modules/websocket/ws_handshake.c +++ b/src/modules/websocket/ws_handshake.c @@ -310,7 +310,7 @@ int ws_handle_handshake(struct sip_msg *msg) (unsigned char *)reply_key.s, base64_enc_len(SHA_DIGEST_LENGTH)); /* Add the connection to the WebSocket connection table */ - wsconn_add(msg->rcv, sub_protocol); + wsconn_add(&msg->rcv, sub_protocol); /* Make sure Kamailio core sends future messages on this connection directly to this module */

1 0

git:master:97c7081d: path: updates for outboud module api
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: 97c7081df94eaabd8e48b084671ea831b5ec9024 URL: https://github.com/kamailio/kamailio/commit/97c7081df94eaabd8e48b084671ea83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T12:51:41+02:00 path: updates for outboud module api --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/97c7081df94eaabd8e48b084671ea83… Patch: https://github.com/kamailio/kamailio/commit/97c7081df94eaabd8e48b084671ea83… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 55cd859c90..137c73b720 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -80,7 +80,7 @@ static int handleOutbound(sip_msg_t* _m, str *user, path_param_t *param) if (path_obb.use_outbound != NULL && path_obb.use_outbound(_m)) { struct via_body *via; - if (path_obb.encode_flow_token(user, _m->rcv) != 0) { + if (path_obb.encode_flow_token(user, &_m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; }

1 0

git:master:6aca846d: rr: updates for outboud module api
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: 6aca846dce4b797a66aaa865fb5a1e81f7806b4c URL: https://github.com/kamailio/kamailio/commit/6aca846dce4b797a66aaa865fb5a1e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T12:51:50+02:00 rr: updates for outboud module api --- Modified: src/modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/6aca846dce4b797a66aaa865fb5a1e8… Patch: https://github.com/kamailio/kamailio/commit/6aca846dce4b797a66aaa865fb5a1e8… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 54da64cf99..0b74356905 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -398,7 +398,7 @@ int record_route(struct sip_msg* _m, str *params) } } } else if (use_ob == 1) { - if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { + if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; } @@ -529,7 +529,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) return -1; } } else if (use_ob == 1) { - if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { + if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; } @@ -781,7 +781,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) return -1; } } else if (use_ob == 1) { - if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { + if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; }

1 0

git:master:56ea88ef: outbound: pass recv info struct by address
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: 56ea88ef9a0628d7ca644f31840101ffe573e5c3 URL: https://github.com/kamailio/kamailio/commit/56ea88ef9a0628d7ca644f31840101f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T12:49:17+02:00 outbound: pass recv info struct by address - fix performance inefficiency for passing large structs by value --- Modified: src/modules/outbound/api.h Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56ea88ef9a0628d7ca644f31840101f… Patch: https://github.com/kamailio/kamailio/commit/56ea88ef9a0628d7ca644f31840101f… --- diff --git a/src/modules/outbound/api.h b/src/modules/outbound/api.h index 6e65e44e17..ae2b3b3615 100644 --- a/src/modules/outbound/api.h +++ b/src/modules/outbound/api.h @@ -30,7 +30,7 @@ #include "../../core/str.h" #include "../../core/sr_module.h" -typedef int (*encode_flow_token_t)(str *, struct receive_info); +typedef int (*encode_flow_token_t)(str *, struct receive_info *); typedef int (*decode_flow_token_t)(struct sip_msg *, struct receive_info **, str); typedef int (*use_outbound_t)(struct sip_msg *); diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 788376541c..82d18a3eca 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -156,7 +156,7 @@ static void destroy(void) static unsigned char unenc_flow_token[UNENC_FLOW_TOKEN_MAX_LENGTH]; static unsigned char hmac_sha1[EVP_MAX_MD_SIZE]; -int encode_flow_token(str *flow_token, struct receive_info rcv) +int encode_flow_token(str *flow_token, struct receive_info *rcv) { int pos = FLOW_TOKEN_START_POS, i; @@ -168,19 +168,19 @@ int encode_flow_token(str *flow_token, struct receive_info rcv) /* Encode protocol information */ unenc_flow_token[pos++] = - (rcv.dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv.proto; + (rcv->dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; /* Encode destination address */ - for (i = 0; i < (rcv.dst_ip.af == AF_INET6 ? 16 : 4); i++) - unenc_flow_token[pos++] = rcv.dst_ip.u.addr[i]; - unenc_flow_token[pos++] = (rcv.dst_port >> 8) & 0xff; - unenc_flow_token[pos++] = rcv.dst_port & 0xff; + for (i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++) + unenc_flow_token[pos++] = rcv->dst_ip.u.addr[i]; + unenc_flow_token[pos++] = (rcv->dst_port >> 8) & 0xff; + unenc_flow_token[pos++] = rcv->dst_port & 0xff; /* Encode source address */ - for (i = 0; i < (rcv.src_ip.af == AF_INET6 ? 16 : 4); i++) - unenc_flow_token[pos++] = rcv.src_ip.u.addr[i]; - unenc_flow_token[pos++] = (rcv.src_port >> 8) & 0xff; - unenc_flow_token[pos++] = rcv.src_port & 0xff; + for (i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++) + unenc_flow_token[pos++] = rcv->src_ip.u.addr[i]; + unenc_flow_token[pos++] = (rcv->src_port >> 8) & 0xff; + unenc_flow_token[pos++] = rcv->src_port & 0xff; /* HMAC-SHA1 the calculated flow-token, truncate to 80 bits, and prepend onto the flow-token */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev