sr-dev October 2016

sr-dev@lists.kamailio.org

28 participants
234 discussions

git:master:585c60f2: websocket: handle CRLF received inside a frame (as SIP layer ping)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 585c60f2cdbf4199b749f74fe795ec583ae9f99c URL: https://github.com/kamailio/kamailio/commit/585c60f2cdbf4199b749f74fe795ec5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-05T17:19:17+02:00 websocket: handle CRLF received inside a frame (as SIP layer ping) - reported by AndrÃ© Freitas, GH #810 --- Modified: modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/585c60f2cdbf4199b749f74fe795ec5… Patch: https://github.com/kamailio/kamailio/commit/585c60f2cdbf4199b749f74fe795ec5… --- diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index 1180ca2..6b32f4f 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -136,6 +136,8 @@ static str str_status_error_closing = str_init("Error closing connection"); static str str_status_error_sending = str_init("Error sending frame"); static str str_status_string_error = str_init("Error converting string to int"); +static int ws_send_crlf(ws_connection_t *wsc, int opcode); + static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) { int pos = 0, extended_length; @@ -680,10 +682,17 @@ int ws_frame_receive(void *data) case OPCODE_BINARY_FRAME: if (likely(frame.wsc->sub_protocol == SUB_PROTOCOL_SIP)) { - LM_DBG("Rx SIP message:\n%.*s\n", frame.payload_len, + LM_DBG("Rx SIP (or text) message:\n%.*s\n", frame.payload_len, frame.payload_data); update_stat(ws_sip_received_frames, 1); + if(frame.payload_len==CRLF_LEN + && strncmp(frame.payload_data, CRLF, CRLF_LEN)==0) + { + ws_send_crlf(frame.wsc, opcode); + wsconn_put(frame.wsc); + return 0; + } if (frame.fin) { @@ -788,7 +797,7 @@ int ws_frame_transmit(void *data) frame.payload_data); if (encode_and_send_ws_frame(&frame, CONN_CLOSE_DONT) < 0) - { + { LM_ERR("sending message\n"); wsconn_put(frame.wsc); @@ -813,7 +822,7 @@ static int ping_pong(ws_connection_t *wsc, int opcode) frame.wsc = wsc; if (encode_and_send_ws_frame(&frame, CONN_CLOSE_DONT) < 0) - { + { LM_ERR("sending keepalive\n"); return -1; } @@ -824,6 +833,25 @@ static int ping_pong(ws_connection_t *wsc, int opcode) return 0; } +static int ws_send_crlf(ws_connection_t *wsc, int opcode) +{ + ws_frame_t frame; + + memset(&frame, 0, sizeof(frame)); + frame.fin = 1; + frame.opcode = opcode; + frame.payload_len = CRLF_LEN; + frame.payload_data = CRLF; + frame.wsc = wsc; + + if (encode_and_send_ws_frame(&frame, CONN_CLOSE_DONT) < 0) { + LM_ERR("failed sending CRLF\n"); + return -1; + } + + return 0; +} + struct mi_root *ws_mi_close(struct mi_root *cmd, void *param) { unsigned int id;

7 years, 7 months

git:master:0868ce2e: Merge pull request #814 from linuxmaniac/vseva/3010

by GitHub

Module: kamailio Branch: master Commit: 0868ce2eccfa31979261c0342395773e2f9b5e36 URL: https://github.com/kamailio/kamailio/commit/0868ce2eccfa31979261c0342395773… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2016-10-05T16:22:19+02:00 Merge pull request #814 from linuxmaniac/vseva/3010 sca: add server_id column to sca_subscriptions table --- Modified: lib/srdb1/schema/sca.xml Modified: modules/sca/sca_db.c Modified: modules/sca/sca_db.h Modified: modules/sca/sca_subscribe.c Modified: modules/sca/sca_subscribe.h Modified: utils/kamctl/db_berkeley/kamailio/sca_subscriptions Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/sca-create.sql Modified: utils/kamctl/dbtext/kamailio/sca_subscriptions Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mysql/sca-create.sql Modified: utils/kamctl/oracle/sca-create.sql Modified: utils/kamctl/postgres/sca-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/sca-mod Modified: utils/kamctl/xhttp_pi/sca-table --- Diff: https://github.com/kamailio/kamailio/commit/0868ce2eccfa31979261c0342395773… Patch: https://github.com/kamailio/kamailio/commit/0868ce2eccfa31979261c0342395773…

7 years, 7 months

git:master:cfb6b1fa: sca: use new server_id column

by Victor Seva

Module: kamailio Branch: master Commit: cfb6b1faae3484a8423e1cc6a0953e4cdc190cd5 URL: https://github.com/kamailio/kamailio/commit/cfb6b1faae3484a8423e1cc6a0953e4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-05T15:27:39+02:00 sca: use new server_id column * bump required version table to 2 Fix #782 --- Modified: modules/sca/sca_db.c Modified: modules/sca/sca_db.h Modified: modules/sca/sca_subscribe.c Modified: modules/sca/sca_subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/cfb6b1faae3484a8423e1cc6a0953e4… Patch: https://github.com/kamailio/kamailio/commit/cfb6b1faae3484a8423e1cc6a0953e4…

7 years, 7 months

git:master:47e7a388: utils/kamctl: refresh dbschema

by Victor Seva

Module: kamailio Branch: master Commit: 47e7a3883ffe13cd09302517ecbcbd2844ee2de2 URL: https://github.com/kamailio/kamailio/commit/47e7a3883ffe13cd09302517ecbcbd2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-05T15:27:34+02:00 utils/kamctl: refresh dbschema See #782 --- Modified: utils/kamctl/db_berkeley/kamailio/sca_subscriptions Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/sca-create.sql Modified: utils/kamctl/dbtext/kamailio/sca_subscriptions Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mysql/sca-create.sql Modified: utils/kamctl/oracle/sca-create.sql Modified: utils/kamctl/postgres/sca-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/sca-mod Modified: utils/kamctl/xhttp_pi/sca-table --- Diff: https://github.com/kamailio/kamailio/commit/47e7a3883ffe13cd09302517ecbcbd2… Patch: https://github.com/kamailio/kamailio/commit/47e7a3883ffe13cd09302517ecbcbd2…

7 years, 7 months

[kamailio/kamailio] sca: add server_id column to sca_subscriptions table (#814)

by Victor Seva

In order to have more than one server with the same DB ``sca`` module has to have a ``server_id`` column to partition subscriptions version bumped to ``2`` See #782 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/814 -- Commit Summary -- * lib/srdb1: sca add server_id * utils/kamctl: refresh dbschema * sca: use new server_id column -- File Changes -- M lib/srdb1/schema/sca.xml (11) M modules/sca/sca_db.c (4) M modules/sca/sca_db.h (6) M modules/sca/sca_subscribe.c (39) M modules/sca/sca_subscribe.h (1) M utils/kamctl/db_berkeley/kamailio/sca_subscriptions (4) M utils/kamctl/db_berkeley/kamailio/version (2) M utils/kamctl/db_sqlite/sca-create.sql (5) M utils/kamctl/dbtext/kamailio/sca_subscriptions (2) M utils/kamctl/dbtext/kamailio/version (2) M utils/kamctl/mysql/sca-create.sql (5) M utils/kamctl/oracle/sca-create.sql (5) M utils/kamctl/postgres/sca-create.sql (5) M utils/kamctl/xhttp_pi/pi_framework.xml (4) M utils/kamctl/xhttp_pi/sca-mod (3) M utils/kamctl/xhttp_pi/sca-table (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/814.patch https://github.com/kamailio/kamailio/pull/814.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/814

7 years, 7 months

[kamailio/kamailio] sca: add server_id column to sca_subscriptions table (#782)

by Victor Seva

Sipwise hat ON: In order to be able to share the same DB and take care of the expired records only related to that server. We need a module parameter to allow filter by server_id when loading values from DB Related to #781 -- 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/782

7 years, 7 months

git:master:fd208710: lib/srdb1: sca add server_id

by Victor Seva

Module: kamailio Branch: master Commit: fd208710a6912cc5cd0d6320b9be05b707a8178b URL: https://github.com/kamailio/kamailio/commit/fd208710a6912cc5cd0d6320b9be05b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-05T15:27:08+02:00 lib/srdb1: sca add server_id * bump sca_susbcriptions version to 2 See #782 --- Modified: lib/srdb1/schema/sca.xml --- Diff: https://github.com/kamailio/kamailio/commit/fd208710a6912cc5cd0d6320b9be05b… Patch: https://github.com/kamailio/kamailio/commit/fd208710a6912cc5cd0d6320b9be05b… --- diff --git a/lib/srdb1/schema/sca.xml b/lib/srdb1/schema/sca.xml index 337b315..52a2380 100644 --- a/lib/srdb1/schema/sca.xml +++ b/lib/srdb1/schema/sca.xml @@ -9,7 +9,7 @@ <table id="sca_susbcriptions" xmlns:db="http://docbook.org/ns/docbook"> <name>sca_subscriptions</name> - <version>1</version> + <version>2</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the sca module to store active subscriptions. At startup time, the sca module loads unexpired subscriptions into its subscription hash table. More information about the sca module can be found at: &KAMAILIO_MOD_DOC;sca.html @@ -111,6 +111,14 @@ <description>Cseq for SUBSCRIBEs sent from subscriber</description> </column> + <column id="server_id"> + <name>server_id</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>The value of server_id from configuration file</description> + </column> + <index> <name>sca_subscriptions_idx</name> <colref linkend="subscriber" /> @@ -122,6 +130,7 @@ <index> <name>sca_expires_idx</name> + <colref linkend="server_id" /> <colref linkend="expires" /> </index>

7 years, 7 months

git:master:f59bc4c2: modules: readme files regenerated - sca ...

by Kamailio Dev

Module: kamailio Branch: master Commit: f59bc4c267cb0b31796be8505f9faae023fcf887 URL: https://github.com/kamailio/kamailio/commit/f59bc4c267cb0b31796be8505f9faae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-10-05T11:16:32+02:00 modules: readme files regenerated - sca ... --- Modified: modules/sca/README --- Diff: https://github.com/kamailio/kamailio/commit/f59bc4c267cb0b31796be8505f9faae… Patch: https://github.com/kamailio/kamailio/commit/f59bc4c267cb0b31796be8505f9faae… --- diff --git a/modules/sca/README b/modules/sca/README index d12e67a..a4f4889 100644 --- a/modules/sca/README +++ b/modules/sca/README @@ -26,6 +26,7 @@ Andrew Mortensen 3.6. subs_table (str) 3.7. db_update_interval (integer) 3.8. onhold_bflag (integer) + 3.9. server_address (string) 4. Functions @@ -52,9 +53,10 @@ Andrew Mortensen 1.6. Set subs_table parameter: 1.7. Set db_update_interval: 1.8. Set onhold_bflag parameter - 1.9. sca_handle_subscribe usage: - 1.10. sca_call_info_update usage: - 1.11. kamailio.cfg + 1.9. Set server_address parameter + 1.10. sca_handle_subscribe usage: + 1.11. sca_call_info_update usage: + 1.12. kamailio.cfg Chapter 1. Admin Guide @@ -75,6 +77,7 @@ Chapter 1. Admin Guide 3.6. subs_table (str) 3.7. db_update_interval (integer) 3.8. onhold_bflag (integer) + 3.9. server_address (string) 4. Functions @@ -160,6 +163,7 @@ Chapter 1. Admin Guide 3.6. subs_table (str) 3.7. db_update_interval (integer) 3.8. onhold_bflag (integer) + 3.9. server_address (string) 3.1. hash_table_size (integer) @@ -267,6 +271,18 @@ modparam( "sca", "db_update_interval", 120 ) modparam("sca", "onhold_bflag", 15) ... +3.9. server_address (string) + + The server address which will become the value of Contact header filed + for NOTIFY messages. + + Default value is "" (disabled). + + Example 1.9. Set server_address parameter +... +modparam("sca", "server_address", "sip:10.10.10.10:5060") +... + 4. Functions 4.1. sca_handle_subscribe() @@ -290,7 +306,7 @@ modparam("sca", "onhold_bflag", 15) * 1 - successful * -1 - failed, error logged - Example 1.9. sca_handle_subscribe usage: + Example 1.10. sca_handle_subscribe usage: ... if ( is_method( "SUBSCRIBE" )) { if ( $hdr(Event) == "call-info" || $hdr(Event) == "line-seize" ) { @@ -334,7 +350,7 @@ if ( is_method( "SUBSCRIBE" )) { * 1 - successful * -1 - failed, error logged - Example 1.10. sca_call_info_update usage: + Example 1.11. sca_call_info_update usage: ... route { @@ -455,7 +471,7 @@ p:215@10.0.1.2 The following is a basic kamailio.cfg providing Shared Call Appearances to local subscribers. It has been tested with Polycom handsets. - Example 1.11. kamailio.cfg + Example 1.12. kamailio.cfg ## #!KAMAILIO #

7 years, 7 months

git:master:17c79903: Merge pull request #812 from linuxmaniac/vseva/2387

by GitHub

Module: kamailio Branch: master Commit: 17c79903b086c974b4a5f65819d241b5563f84f5 URL: https://github.com/kamailio/kamailio/commit/17c79903b086c974b4a5f65819d241b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2016-10-05T11:15:05+02:00 Merge pull request #812 from linuxmaniac/vseva/2387 sca: add "server_address" parameter --- Modified: modules/sca/doc/sca_admin.xml Modified: modules/sca/sca.c Modified: modules/sca/sca.h Modified: modules/sca/sca_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/17c79903b086c974b4a5f65819d241b… Patch: https://github.com/kamailio/kamailio/commit/17c79903b086c974b4a5f65819d241b… --- diff --git a/modules/sca/doc/sca_admin.xml b/modules/sca/doc/sca_admin.xml index f024674..bf212a3 100644 --- a/modules/sca/doc/sca_admin.xml +++ b/modules/sca/doc/sca_admin.xml @@ -283,6 +283,27 @@ modparam("sca", "onhold_bflag", 15) </programlisting> </example> </section> + + <section id="sca.p.server_address"> + <title><varname>server_address</varname> (string)</title> + <para> + The server address which will become the value of Contact header filed + for NOTIFY messages. + </para> + <para> + <emphasis> + Default value is "" (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>server_address</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sca", "server_address", "sip:10.10.10.10:5060") +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules/sca/sca.c b/modules/sca/sca.c index 30eabc9..1a39cdc 100644 --- a/modules/sca/sca.c +++ b/modules/sca/sca.c @@ -137,6 +137,7 @@ int call_info_max_expires = 3600; int line_seize_max_expires = 15; int purge_expired_interval = 120; int onhold_bflag = -1; +str server_address = STR_NULL; static param_export_t params[] = { {"outbound_proxy", PARAM_STR, &outbound_proxy}, @@ -149,6 +150,7 @@ static param_export_t params[] = { {"line_seize_max_expires", INT_PARAM, &line_seize_max_expires}, {"purge_expired_interval", INT_PARAM, &purge_expired_interval}, {"onhold_bflag", INT_PARAM, &onhold_bflag}, + {"server_address", PARAM_STR, &server_address}, {NULL, 0, NULL}, }; @@ -287,6 +289,10 @@ static int sca_set_config(sca_mod *scam) } scam->cfg->onhold_bflag = onhold_bflag; + if (server_address.s) { + scam->cfg->server_address = &server_address; + } + return (0); } diff --git a/modules/sca/sca.h b/modules/sca/sca.h index 2c20e76..04d3c1e 100644 --- a/modules/sca/sca.h +++ b/modules/sca/sca.h @@ -38,6 +38,7 @@ struct _sca_config { int line_seize_max_expires; int purge_expired_interval; int onhold_bflag; + str *server_address; }; typedef struct _sca_config sca_config; diff --git a/modules/sca/sca_notify.c b/modules/sca/sca_notify.c index daa4e0c..a654fb9 100644 --- a/modules/sca/sca_notify.c +++ b/modules/sca/sca_notify.c @@ -181,15 +181,23 @@ static int sca_notify_append_contact_header(sca_subscription *sub, char *hdrbuf, int maxlen) { int len = strlen("Contact: "); + str *orig = NULL; - if (len + sub->target_aor.len + strlen(CRLF) >= maxlen) { + if (sca->cfg->server_address != NULL) { + orig = sca->cfg->server_address; + } + else { + orig = &sub->target_aor; + } + + if (len + orig->len + strlen(CRLF) >= maxlen) { LM_ERR("Cannot append Contact header: buffer too small\n"); return (-1); } memcpy(hdrbuf, "Contact: ", len); - memcpy(hdrbuf + len, sub->target_aor.s, sub->target_aor.len); - len += sub->target_aor.len; + memcpy(hdrbuf + len, orig->s, orig->len); + len += orig->len; memcpy(hdrbuf + len, CRLF, strlen(CRLF)); len += strlen(CRLF);

7 years, 7 months

git:master:0c710840: sca: add "server_address" parameter

by Victor Seva

Module: kamailio Branch: master Commit: 0c710840f7a7aee7a27b3ffdbcb106d9e8e5bde1 URL: https://github.com/kamailio/kamailio/commit/0c710840f7a7aee7a27b3ffdbcb106d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-05T09:38:27+02:00 sca: add "server_address" parameter * server address (sip:<host>[:port]) which will become the value of Contact header filed for NOTIFY messages. --- Modified: modules/sca/doc/sca_admin.xml Modified: modules/sca/sca.c Modified: modules/sca/sca.h Modified: modules/sca/sca_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/0c710840f7a7aee7a27b3ffdbcb106d… Patch: https://github.com/kamailio/kamailio/commit/0c710840f7a7aee7a27b3ffdbcb106d… --- diff --git a/modules/sca/doc/sca_admin.xml b/modules/sca/doc/sca_admin.xml index f024674..bf212a3 100644 --- a/modules/sca/doc/sca_admin.xml +++ b/modules/sca/doc/sca_admin.xml @@ -283,6 +283,27 @@ modparam("sca", "onhold_bflag", 15) </programlisting> </example> </section> + + <section id="sca.p.server_address"> + <title><varname>server_address</varname> (string)</title> + <para> + The server address which will become the value of Contact header filed + for NOTIFY messages. + </para> + <para> + <emphasis> + Default value is "" (disabled). + </emphasis> + </para> + <example> + <title>Set <varname>server_address</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sca", "server_address", "sip:10.10.10.10:5060") +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules/sca/sca.c b/modules/sca/sca.c index 30eabc9..1a39cdc 100644 --- a/modules/sca/sca.c +++ b/modules/sca/sca.c @@ -137,6 +137,7 @@ int call_info_max_expires = 3600; int line_seize_max_expires = 15; int purge_expired_interval = 120; int onhold_bflag = -1; +str server_address = STR_NULL; static param_export_t params[] = { {"outbound_proxy", PARAM_STR, &outbound_proxy}, @@ -149,6 +150,7 @@ static param_export_t params[] = { {"line_seize_max_expires", INT_PARAM, &line_seize_max_expires}, {"purge_expired_interval", INT_PARAM, &purge_expired_interval}, {"onhold_bflag", INT_PARAM, &onhold_bflag}, + {"server_address", PARAM_STR, &server_address}, {NULL, 0, NULL}, }; @@ -287,6 +289,10 @@ static int sca_set_config(sca_mod *scam) } scam->cfg->onhold_bflag = onhold_bflag; + if (server_address.s) { + scam->cfg->server_address = &server_address; + } + return (0); } diff --git a/modules/sca/sca.h b/modules/sca/sca.h index 2c20e76..04d3c1e 100644 --- a/modules/sca/sca.h +++ b/modules/sca/sca.h @@ -38,6 +38,7 @@ struct _sca_config { int line_seize_max_expires; int purge_expired_interval; int onhold_bflag; + str *server_address; }; typedef struct _sca_config sca_config; diff --git a/modules/sca/sca_notify.c b/modules/sca/sca_notify.c index daa4e0c..a654fb9 100644 --- a/modules/sca/sca_notify.c +++ b/modules/sca/sca_notify.c @@ -181,15 +181,23 @@ static int sca_notify_append_contact_header(sca_subscription *sub, char *hdrbuf, int maxlen) { int len = strlen("Contact: "); + str *orig = NULL; - if (len + sub->target_aor.len + strlen(CRLF) >= maxlen) { + if (sca->cfg->server_address != NULL) { + orig = sca->cfg->server_address; + } + else { + orig = &sub->target_aor; + } + + if (len + orig->len + strlen(CRLF) >= maxlen) { LM_ERR("Cannot append Contact header: buffer too small\n"); return (-1); } memcpy(hdrbuf, "Contact: ", len); - memcpy(hdrbuf + len, sub->target_aor.s, sub->target_aor.len); - len += sub->target_aor.len; + memcpy(hdrbuf + len, orig->s, orig->len); + len += orig->len; memcpy(hdrbuf + len, CRLF, strlen(CRLF)); len += strlen(CRLF);

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2016