sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
250 discussions

Using t_suspend()/t_continue() multiple times on the same transaction

by Peter Dunkley

Hi, I am trying to use t_suspend()/t_continue() multiple times on the same transaction. Calling t_suspend() more than once works, but the second time I call t_continue() the transaction is killed and a 500 response is sent. It is the "if (branch == t->nr_of_outgoings)" check from the code fragment below (from t_suspend.c:t_continue()) that results in the transaction being killed - you can see the debug/error line I added to determine this in the fragment. Is using t_suspend()/t_continue() multiple times something that should work? Thanks, Peter if (t->uas.status < 200) { /* No final reply has been sent yet. * Check whether or not there is any pending branch. */ for ( branch = 0; branch < t->nr_of_outgoings; branch++ ) { if ((t->uac[branch].request.buffer != NULL) && (t->uac[branch].last_received < 200) ) break; } if (branch == t->nr_of_outgoings) { /* There is not any open branch so there is * no chance that a final response will be received. */ ret = 0; LM_ERR("branch == t->nr_of_outgoings\n"); goto kill_trans; } } -- Peter Dunkley Technical Director Crocodile RCS Ltd

9 years, 9 months

git:pd/websocket: core: Added more PROTO_WS and PROTO_WSS checks

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 3d4a77d86a879d55f8b39bc2a86bc2f51d0258f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d4a77d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 22:53:00 2012 +0100 core: Added more PROTO_WS and PROTO_WSS checks --- action.c | 6 ++++-- lib/kcore/statistics.c | 4 ++++ main.c | 2 ++ msg_translator.c | 44 +++++++++++++++++++++++++++++++++++++++++++- socket_info.c | 2 ++ tcp_main.c | 18 +++++++++--------- 6 files changed, 64 insertions(+), 12 deletions(-) diff --git a/action.c b/action.c index 5263f02..5e0875c 100644 --- a/action.c +++ b/action.c @@ -446,8 +446,10 @@ int do_action(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) u->proto); ret=E_BAD_PROTO; goto error_fwd_uri; - } - dst.proto=PROTO_TLS; + } else if (u->proto!=PROTO_WSS) + dst.proto=PROTO_TLS; + else + dst.proto=PROTO_WSS; } #endif } diff --git a/lib/kcore/statistics.c b/lib/kcore/statistics.c index 663c064..6028bc3 100644 --- a/lib/kcore/statistics.c +++ b/lib/kcore/statistics.c @@ -136,6 +136,8 @@ int get_socket_list_from_proto(int **ipList, int protocol) { return 0; } #endif + if (protocol == PROTO_WS || protocol == PROTO_WSS) + return 0; /* Retrieve the list of sockets with respect to the given protocol. */ list=get_sock_info_list(protocol); @@ -409,6 +411,8 @@ int get_total_bytes_waiting(void) numUDPSockets = get_socket_list_from_proto(&UDPList, PROTO_UDP); numTCPSockets = get_socket_list_from_proto(&TCPList, PROTO_TCP); numTLSSockets = get_socket_list_from_proto(&TLSList, PROTO_TLS); + /* Deliberately not looking at PROTO_WS or PROTO_WSS here as they are + just upgraded TCP/TLS connections */ /* Find out the number of bytes waiting on our interface list over all * UDP and TCP transports. */ diff --git a/main.c b/main.c index 306e409..ca272e1 100644 --- a/main.c +++ b/main.c @@ -976,6 +976,8 @@ static int parse_proto(unsigned char* s, long len, int* proto) } #endif /* USE_SCTP */ else + /* Deliberately leaving out PROTO_WS and PROTO_WSS as these are just + upgraded TCP/TLS connections. */ return -1; return 0; } diff --git a/msg_translator.c b/msg_translator.c index e4f0d74..2c38000 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -657,7 +657,11 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, break; \ case PROTO_SCTP: \ new_len+=4; \ - break; \ + break; \ + case PROTO_WS: \ + case PROTO_WSS: \ + new_len+=2; \ + break; \ default: \ LOG(L_CRIT, "BUG: lumps_len: unknown proto %d\n", \ msg->rcv.bind_address->proto); \ @@ -688,6 +692,10 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, case PROTO_SCTP: \ new_len+=TRANSPORT_PARAM_LEN+4; \ break; \ + case PROTO_WS: \ + case PROTO_WSS: \ + new_len+=TRANSPORT_PARAM_LEN+2; \ + break; \ default: \ LOG(L_CRIT, "BUG: lumps_len: unknown proto %d\n", \ msg->rcv.bind_address->proto); \ @@ -729,6 +737,10 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, case PROTO_SCTP: \ new_len+=4; \ break; \ + case PROTO_WS: \ + case PROTO_WSS: \ + new_len+=2; \ + break; \ default: \ LOG(L_CRIT, "BUG: lumps_len: unknown proto %d\n", \ send_sock->proto); \ @@ -761,6 +773,10 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, case PROTO_SCTP: \ new_len+=TRANSPORT_PARAM_LEN+4; \ break; \ + case PROTO_WS: \ + case PROTO_WSS: \ + new_len+=TRANSPORT_PARAM_LEN+2; \ + break; \ default: \ LOG(L_CRIT, "BUG: lumps_len: unknown proto %d\n", \ send_sock->proto); \ @@ -1051,6 +1067,14 @@ static inline void process_lumps( struct sip_msg* msg, memcpy(new_buf+offset, "sctp", 4); \ offset+=4; \ break; \ + case PROTO_WS: \ + case PROTO_WSS: \ + memcpy(new_buf+offset, TRANSPORT_PARAM, \ + TRANSPORT_PARAM_LEN); \ + offset+=TRANSPORT_PARAM_LEN; \ + memcpy(new_buf+offset, "ws", 2); \ + offset+=2; \ + break; \ default: \ LOG(L_CRIT, "BUG: process_lumps: unknown proto %d\n", \ msg->rcv.bind_address->proto); \ @@ -1138,6 +1162,14 @@ static inline void process_lumps( struct sip_msg* msg, memcpy(new_buf+offset, "sctp", 4); \ offset+=4; \ break; \ + case PROTO_WS: \ + case PROTO_WSS: \ + memcpy(new_buf+offset, TRANSPORT_PARAM, \ + TRANSPORT_PARAM_LEN); \ + offset+=TRANSPORT_PARAM_LEN; \ + memcpy(new_buf+offset, "ws", 2); \ + offset+=2; \ + break; \ default: \ LOG(L_CRIT, "BUG: process_lumps: unknown proto %d\n", \ send_sock->proto); \ @@ -1168,6 +1200,11 @@ static inline void process_lumps( struct sip_msg* msg, memcpy(new_buf+offset, "sctp", 4); \ offset+=4; \ break; \ + case PROTO_WS: \ + case PROTO_WSS: \ + memcpy(new_buf+offset, "ws", 2); \ + offset+=2; \ + break; \ default: \ LOG(L_CRIT, "BUG: process_lumps: unknown proto %d\n", \ msg->rcv.bind_address->proto); \ @@ -1198,6 +1235,11 @@ static inline void process_lumps( struct sip_msg* msg, memcpy(new_buf+offset, "sctp", 4); \ offset+=4; \ break; \ + case PROTO_WS: \ + case PROTO_WSS: \ + memcpy(new_buf+offset, "ws", 2); \ + offset+=4; \ + break; \ default: \ LOG(L_CRIT, "BUG: process_lumps: unknown proto %d\n", \ send_sock->proto); \ diff --git a/socket_info.c b/socket_info.c index f8655b9..aec4f53 100644 --- a/socket_info.c +++ b/socket_info.c @@ -140,6 +140,8 @@ inline static void addr_info_list_ins_lst(struct addr_info* lst, /* protocol order, filled by init_proto_order() */ enum sip_protos nxt_proto[PROTO_LAST+1]= { PROTO_UDP, PROTO_TCP, PROTO_TLS, PROTO_SCTP, 0 }; +/* Deliberately left PROTO_WS and PROTO_WSS out of this as they are just + upgraded TCP and TLS connections */ diff --git a/tcp_main.c b/tcp_main.c index c5a2547..a6e3019 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1427,7 +1427,7 @@ static inline void _tcpconn_free(struct tcp_connection* c) #endif lock_destroy(&c->write_lock); #ifdef USE_TLS - if (unlikely(c->type==PROTO_TLS)) tls_tcpconn_clean(c); + if (unlikely(c->type==PROTO_TLS || c->type==PROTO_WSS)) tls_tcpconn_clean(c); #endif shm_free(c); } @@ -1456,7 +1456,7 @@ void tcpconn_rm(struct tcp_connection* c) TCPCONN_UNLOCK; lock_destroy(&c->write_lock); #ifdef USE_TLS - if ((c->type==PROTO_TLS)&&(c->extra_data)) tls_tcpconn_clean(c); + if ((c->type==PROTO_TLS || c->type==PROTO_WSS)&&(c->extra_data)) tls_tcpconn_clean(c); #endif shm_free(c); } @@ -2270,7 +2270,7 @@ static int tcpconn_send_put(struct tcp_connection* c, const char* buf, { do_close_fd=0; #ifdef USE_TLS - if (unlikely(c->type==PROTO_TLS)) { + if (unlikely(c->type==PROTO_TLS || c->type==PROTO_WSS)) { t_buf = buf; t_len = len; do { @@ -2372,7 +2372,7 @@ static int tcpconn_send_put(struct tcp_connection* c, const char* buf, } #ifdef USE_TLS - if (unlikely(c->type==PROTO_TLS)) { + if (unlikely(c->type==PROTO_TLS || c->type==PROTO_WSS)) { /* for TLS the TLS processing and the send must happen atomically w/ respect to other sends on the same connection (otherwise reordering might occur which would break TLS) => @@ -2958,7 +2958,7 @@ inline static void tcpconn_close_main_fd(struct tcp_connection* tcpconn) fd=tcpconn->s; #ifdef USE_TLS - if (tcpconn->type==PROTO_TLS) + if (tcpconn->type==PROTO_TLS || tcpconn->type==PROTO_WSS) tls_close(tcpconn, fd); #endif #ifdef TCP_FD_CACHE @@ -3025,7 +3025,7 @@ inline static void tcpconn_destroy(struct tcp_connection* tcpconn) tcpconn_close_main_fd(tcpconn); tcpconn->flags|=F_CONN_FD_CLOSED; (*tcp_connections_no)--; - if (unlikely(tcpconn->type==PROTO_TLS)) + if (unlikely(tcpconn->type==PROTO_TLS || tcpconn->type==PROTO_WSS)) (*tls_connections_no)--; } _tcpconn_free(tcpconn); /* destroys also the wbuf_q if still present*/ @@ -3073,7 +3073,7 @@ inline static int tcpconn_put_destroy(struct tcp_connection* tcpconn) tcpconn_close_main_fd(tcpconn); tcpconn->flags|=F_CONN_FD_CLOSED; (*tcp_connections_no)--; - if (unlikely(tcpconn->type==PROTO_TLS)) + if (unlikely(tcpconn->type==PROTO_TLS || tcpconn->type==PROTO_WSS)) (*tls_connections_no)--; } /* all the flags / ops on the tcpconn must be done prior to decrementing @@ -4509,7 +4509,7 @@ static inline void tcpconn_destroy_all(void) fd=-1; } #ifdef USE_TLS - if (fd>0 && c->type==PROTO_TLS) + if (fd>0 && (c->type==PROTO_TLS || c->type==PROTO_WSS)) tls_close(c, fd); #endif _tcpconn_rm(c); @@ -4522,7 +4522,7 @@ static inline void tcpconn_destroy_all(void) tcp_safe_close(fd); } (*tcp_connections_no)--; - if (unlikely(c->type==PROTO_TLS)) + if (unlikely(c->type==PROTO_TLS || c->type==PROTO_WSS)) (*tls_connections_no)--; c=next; }

11 years, 9 months

git:pd/websocket: modules/websocket: Removed SIPp script and HTML file from example directory

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 56767ad8cb445f8475c6372c964c4d57fb40a500 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56767ad… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 22:52:26 2012 +0100 modules/websocket: Removed SIPp script and HTML file from example directory --- modules/websocket/example/options_rx.xml | 28 ---------- modules/websocket/example/websocket_test.html | 68 ------------------------- 2 files changed, 0 insertions(+), 96 deletions(-) diff --git a/modules/websocket/example/options_rx.xml b/modules/websocket/example/options_rx.xml deleted file mode 100644 index d3160b6..0000000 --- a/modules/websocket/example/options_rx.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!DOCTYPE scenario SYSTEM "sipp.dtd"> - -<scenario name="Basic OPTIONS responder"> - <recv request="OPTIONS" crlf="true"> - </recv> - - <send> - <![CDATA[ - - SIP/2.0 200 OK - [last_Via:] - [last_From:] - [last_To:];tag=[pid]SIPpTag01[call_number] - [last_Call-ID:] - [last_CSeq:] - Contact: <sip:[local_ip]:[local_port];transport=[transport]> - Content-Length: 0 - - ]]> - </send> - - <timewait milliseconds="4000"/> - <ResponseTimeRepartition value="10, 20, 30, 40, 50, 100, 150, 200"/> - <CallLengthRepartition value="10, 50, 100, 500, 1000, 5000, 10000"/> - -</scenario> - diff --git a/modules/websocket/example/websocket_test.html b/modules/websocket/example/websocket_test.html deleted file mode 100644 index a7f9d20..0000000 --- a/modules/websocket/example/websocket_test.html +++ /dev/null @@ -1,68 +0,0 @@ -<!DOCTYPE html> - -<meta charset="utf-8" /> - -<title>WebSocket Test</title> - -<script language="javascript" type="text/javascript"> -var wsUri = "wss://192.168.111.2/"; -var output; - -function init() -{ - output = document.getElementById("output"); - testWebSocket(); -} - -function testWebSocket() -{ - websocket = new WebSocket(wsUri, "sip"); - websocket.onopen = function(evt) { onOpen(evt) }; - websocket.onclose = function(evt) { onClose(evt) }; - websocket.onmessage = function(evt) { onMessage(evt) }; - websocket.onerror = function(evt) { onError(evt) }; -} - -function onOpen(evt) -{ - writeToScreen("CONNECTED"); - doSend("OPTIONS sip:alice@example.com SIP/2.0\r\nVia: SIP/2.0/WSS abcd1234.invalid;branch=z9hG4bkabcd1234\r\nMax-Forwards: 70\r\nTo: <sip:alice@example.com>\r\nFrom: <sip:bob@example.com>;tag=abcd1234\r\nCall-ID: abcd1234\r\nCSeq: 1 OPTIONS\r\nContact: <sip:bob@abcd1234;transport=ws>\r\n\r\n"); -} - -function onClose(evt) -{ - writeToScreen("DISCONNECTED"); -} - -function onMessage(evt) -{ - writeToScreen('<span style="color: blue;">RESPONSE: ' + evt.data+'</span>'); websocket.close(); -} - -function onError(evt) -{ - writeToScreen('<span style="color: red;">ERROR:</span> ' + evt.data); -} - -function doSend(message) -{ - writeToScreen("SENT: " + message); - websocket.send(message); -} - -function writeToScreen(message) -{ - var pre = document.createElement("p"); - pre.style.wordWrap = "break-word"; - pre.innerHTML = message; output.appendChild(pre); -} - -window.addEventListener("load", init, false); - -</script> - -<h2>WebSocket Test</h2> - -<div id="output"></div> - -</html>

11 years, 9 months

git:pd/websocket: Merge branch 'master' into websocket

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: fd2a237fbac519ad709c5f169cbc3f29b125409f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd2a237… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 21:13:58 2012 +0100 Merge branch 'master' into websocket Conflicts: pkg/kamailio/fedora/16/kamailio.spec ---

11 years, 9 months

git:master: pkg/kamailio/fedora: Updated some packaging related stuff

by Peter Dunkley

Module: sip-router Branch: master Commit: 8c789cdeb969af921e74a4ece194ccda5c297e6a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c789cd… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 21:05:40 2012 +0100 pkg/kamailio/fedora: Updated some packaging related stuff - Updated the rel in the .spec to dev1 - Replaced local %{_sharedir} macro in .spec with standard %{_datadir} macro - Tweak/update to Fedora 16 test appliance - Added BoxGrinder appliances for Fedora 17 --- pkg/kamailio/fedora/16/kamailio.appl | 2 +- pkg/kamailio/fedora/16/kamailio.spec | 30 ++++++++++--------- pkg/kamailio/fedora/17/kamailio-build.appl | 44 ++++++++++++++++++++++++++++ pkg/kamailio/fedora/17/kamailio.appl | 39 ++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 15 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.appl b/pkg/kamailio/fedora/16/kamailio.appl index be24a7f..f65ecd2 100644 --- a/pkg/kamailio/fedora/16/kamailio.appl +++ b/pkg/kamailio/fedora/16/kamailio.appl @@ -25,7 +25,7 @@ packages: - mod_perl # kamailio-perl - mono-core # kamailio-mono - mysql-libs # kamailio-mysql - - net-snmp-agent-libs # kamailio-snmpstats + - net-snmp-libs # kamailio-snmpstats - openldap # kamailio-ldap - openssl # kamailio-tls - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index ecd9405..47f7234 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -1,7 +1,6 @@ %define name kamailio %define ver 3.4.0 -%define rel dev0%{dist} -%define _sharedir %{_prefix}/share +%define rel dev1%{dist} @@ -682,10 +681,10 @@ fi %{_mandir}/man5/* %{_mandir}/man8/* -%dir %{_sharedir}/kamailio -%dir %{_sharedir}/kamailio/dbtext -%dir %{_sharedir}/kamailio/dbtext/kamailio -%{_sharedir}/kamailio/dbtext/kamailio/* +%dir %{_datadir}/kamailio +%dir %{_datadir}/kamailio/dbtext +%dir %{_datadir}/kamailio/dbtext/kamailio +%{_datadir}/kamailio/dbtext/kamailio/* %files mysql @@ -694,8 +693,8 @@ fi %{_libdir}/kamailio/modules/db_mysql.so %{_libdir}/kamailio/kamctl/kamctl.mysql %{_libdir}/kamailio/kamctl/kamdbctl.mysql -%dir %{_sharedir}/kamailio/mysql -%{_sharedir}/kamailio/mysql/* +%dir %{_datadir}/kamailio/mysql +%{_datadir}/kamailio/mysql/* %files postgresql @@ -704,8 +703,8 @@ fi %{_libdir}/kamailio/modules/db_postgres.so %{_libdir}/kamailio/kamctl/kamctl.pgsql %{_libdir}/kamailio/kamctl/kamdbctl.pgsql -%dir %{_sharedir}/kamailio/postgres -%{_sharedir}/kamailio/postgres/* +%dir %{_datadir}/kamailio/postgres +%{_datadir}/kamailio/postgres/* %files unixODBC @@ -721,8 +720,8 @@ fi %{_libdir}/kamailio/modules/db_berkeley.so %{_libdir}/kamailio/kamctl/kamctl.db_berkeley %{_libdir}/kamailio/kamctl/kamdbctl.db_berkeley -%dir %{_sharedir}/kamailio/db_berkeley -%{_sharedir}/kamailio/db_berkeley/* +%dir %{_datadir}/kamailio/db_berkeley +%{_datadir}/kamailio/db_berkeley/* %files sqlite @@ -731,8 +730,8 @@ fi %{_libdir}/kamailio/modules_k/db_sqlite.so %{_libdir}/kamailio/kamctl/kamctl.sqlite %{_libdir}/kamailio/kamctl/kamdbctl.sqlite -%dir %{_sharedir}/kamailio/db_sqlite -%{_sharedir}/kamailio/db_sqlite/* +%dir %{_datadir}/kamailio/db_sqlite +%{_datadir}/kamailio/db_sqlite/* %files utils @@ -941,6 +940,9 @@ fi %changelog +* Sat Jun 30 2012 Peter Dunkley <peter(a)dunkley.me.uk> + - Updated rel to dev1 + - Removed %_sharedir and replaced with standard macro %_datadir * Mon Jun 11 2012 Peter Dunkley <peter(a)dunkley.me.uk> - Updated ver to 3.4.0 and rel to dev0 * Mon Jun 4 2012 Peter Dunkley <peter(a)dunkley.me.uk> diff --git a/pkg/kamailio/fedora/17/kamailio-build.appl b/pkg/kamailio/fedora/17/kamailio-build.appl new file mode 100644 index 0000000..4b194d4 --- /dev/null +++ b/pkg/kamailio/fedora/17/kamailio-build.appl @@ -0,0 +1,44 @@ +name: "kamailio-build-#OS_NAME#-#OS_VERSION#-#BASE_ARCH#" +summary: "#OS_NAME# #OS_VERSION# for building Kamailio #BASE_ARCH# RPMs" +os: + name: fedora + version: 17 + password: kamailio +hardware: + memory: 1024 + partitions: + "/": + size: 4 +packages: + - @core + - bison # kamailio + - db4-devel # kamailio-bdb + - expat-devel # kamailio-xmpp + - flex # kamailio + - GeoIP-devel # kamailio-GeoIP + - gcc # kamailio + - glib-devel # kamailio-purple + - hiredis-devel # kamailio-redis + - json-c-devel # kamailio-json + - libconfuse-devel # kamailio-carrierroute + - libcurl-devel # kamailio-utils, kamailio-presence + - libevent-devel # kamailio-json + - libpurple-devel # kamailio-purple + - libxml2-devel # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops + - lua-devel # kamailio-lua + - make # kamailio + - mod_perl-devel # kamailio-perl + - mono-devel # kamailio-mono + - mysql-devel # kamailio-mysql + - net-snmp-devel # kamailio-snmpstats + - openldap-devel # kamailio-ldap + - openssl-devel # kamailio-tls + - pcre-devel # kamailio-regex, kamailio-dialplan, kamailio-lcr + - postgresql-devel # kamailio-postgresql + - python-devel # kamailio-python + - radiusclient-ng-devel # kamailio-radius + - redhat-rpm-config # kamailio-debuginfo + - rpm-build + - sqlite-devel # kamailio-sqlite + - unixODBC-devel # kamailio-unixODBC + - zlib-devel # kamailio-mysql diff --git a/pkg/kamailio/fedora/17/kamailio.appl b/pkg/kamailio/fedora/17/kamailio.appl new file mode 100644 index 0000000..e71964a --- /dev/null +++ b/pkg/kamailio/fedora/17/kamailio.appl @@ -0,0 +1,39 @@ +name: "kamailio-#OS_NAME#-#OS_VERSION#-#BASE_ARCH#" +summary: "#OS_NAME# #OS_VERSION# for installing Kamailio #BASE_ARCH# RPMs" +os: + name: fedora + version: 17 + password: kamailio +hardware: + memory: 1024 + partitions: + "/": + size: 2 +packages: + - @core + - db4 # kamailio-bdb + - expat # kamailio-xmpp + - GeoIP # kamailio-GeoIP + - glib # kamailio-purple + - hiredis # kamailio-redis + - json-c # kamailio-json + - libconfuse # kamailio-carrierroute + - libcurl # kamailio-utils, kamailio-presence + - libevent # kamailio-json + - libpurple # kamailio-purple + - libxml2 # kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops + - mod_perl # kamailio-perl + - mono-core # kamailio-mono + - mysql-libs # kamailio-mysql + - net-snmp-libs # kamailio-snmpstats + - openldap # kamailio-ldap + - openssl # kamailio-tls + - pcre # kamailio-regex, kamailio-dialplan, kamailio-lcr + - perl-Authen-SASL # kamailio-perl + - perl-LDAP # kamailio-perl + - postgresql-libs # kamailio-postgresql + - python # kamailio-python + - radiusclient-ng # kamailio-radius + - sqlite # kamailio-sqlite + - unixODBC # kamailio-unixODBC + - zlib # kamailio-mysql

11 years, 9 months

git:pd/websocket: modules/websocket: Corrected output of ws.dump MI command

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: b66e815ebe9ee9a5035abaf08c6e97a9c3281dcc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b66e815… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 20:36:00 2012 +0100 modules/websocket: Corrected output of ws.dump MI command --- modules/websocket/ws_conn.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index e2795a0..fdaba36 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -321,11 +321,11 @@ static int add_node(struct mi_root *tree, ws_connection_t *wsc) if (con) { - src_proto = (con->rcv.proto== PROTO_TCP) ? "ws" : "wss"; + src_proto = (con->rcv.proto== PROTO_WS) ? "ws" : "wss"; memset(src_ip, 0, IP6_MAX_STR_SIZE + 1); ip_addr2sbuf(&con->rcv.src_ip, src_ip, IP6_MAX_STR_SIZE); - dst_proto = (con->rcv.proto == PROTO_TCP) ? "ws" : "wss"; + dst_proto = (con->rcv.proto == PROTO_WS) ? "ws" : "wss"; memset(dst_ip, 0, IP6_MAX_STR_SIZE + 1); ip_addr2sbuf(&con->rcv.dst_ip, src_ip, IP6_MAX_STR_SIZE);

11 years, 9 months

git:pd/websocket: core: Fixed segmentation fault

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 6fe3e10b4a17c166f642500748392a9bcb72cabd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fe3e10… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 20:35:10 2012 +0100 core: Fixed segmentation fault - Tiny window for this... but I hit it when Google Chrome crashed during a WebSocket session --- forward.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/forward.h b/forward.h index 02cfd12..2b9ae78 100644 --- a/forward.h +++ b/forward.h @@ -164,6 +164,12 @@ static inline int msg_send(struct dest_info* dst, char* buf, int len) return -1; } + if (con == NULL) + { + LM_WARN("TCP/TLS connection for WebSocket could not be found\n"); + return -1; + } + memset(&wsev, 0, sizeof(ws_event_info_t)); wsev.type = SREV_TCP_WS_FRAME_OUT; wsev.buf = outb.s;

11 years, 9 months

git:pd/websocket: modules/websocket: Updated connection reuse and closing flags for WebSocket handshake.

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 5456e4e90c6330877e0d25d14fba143f2f98f8c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5456e4e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 00:46:20 2012 +0100 modules/websocket: Updated connection reuse and closing flags for WebSocket handshake. - Updated the sample kamailio.cfg to match too. --- modules/websocket/example/kamailio.cfg | 5 ++++ modules/websocket/ws_handshake.c | 37 +++++++++++++++++++------------ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/modules/websocket/example/kamailio.cfg b/modules/websocket/example/kamailio.cfg index 48cfa4a..c4bd83f 100644 --- a/modules/websocket/example/kamailio.cfg +++ b/modules/websocket/example/kamailio.cfg @@ -306,6 +306,9 @@ onreply_route[WS_REPLY] { } event_route[xhttp:request] { + set_reply_close(); + set_reply_no_connect(); + if ($Rp != MY_WS_PORT && $Rp != MY_WSS_PORT) { xlog("L_WARN", "HTTP request received on $Rp\n"); xhttp_reply("403", "Forbidden", "", ""); @@ -330,6 +333,8 @@ event_route[xhttp:request] { # Optional... validate Origin # Optional... perform HTTP authentication + # ws_handle_handshake() exits (no further configuration file + # processing of the request) when complete. ws_handle_handshake(); } diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 4bacd61..bb53ef7 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -115,6 +115,14 @@ int ws_handle_handshake(struct sip_msg *msg) int version; struct hdr_field *hdr = msg->headers; struct tcp_connection *con; + ws_connection_t *wsc; + + /* Make sure that the connection is closed after the response _and_ + the existing connection (from the request) is reused for the + response. The close flag will be unset later if the handshake is + successful. */ + msg->rpl_send_flags.f |= SND_F_CON_CLOSE; + msg->rpl_send_flags.f |= SND_F_FORCE_CON_REUSE; if (*ws_enabled == 0) { @@ -283,7 +291,18 @@ int ws_handle_handshake(struct sip_msg *msg) reply_key.len = base64_enc(sha1, 20, (unsigned char *) reply_key.s, KEY_BUF_LEN); - /* Build headers for reply */ + /* Add the connection to the WebSocket connection table */ + wsconn_add(msg->rcv.proto_reserved1); + + /* Make sure Kamailio core sends future messages on this connection + directly to this module */ + if (con->type == PROTO_TLS) + con->type = con->rcv.proto = PROTO_WSS; + else + con->type = con->rcv.proto = PROTO_WS; + + /* Now Kamailio is ready to receive WebSocket frames build and send a + 101 reply */ headers.s = headers_buf; headers.len = snprintf(headers.s, HDR_BUF_LEN, "%.*s: %.*s\r\n" @@ -299,21 +318,11 @@ int ws_handle_handshake(struct sip_msg *msg) reply_key.s, str_hdr_sec_websocket_protocol.len, str_hdr_sec_websocket_protocol.s, str_sip.len, str_sip.s); - - /* Send reply */ + msg->rpl_send_flags.f &= ~SND_F_CON_CLOSE; if (ws_send_reply(msg, 101, &str_status_switching_protocols, &headers) < 0) - return 0; - - /* Add the connection to the WebSocket connection table */ - wsconn_add(con->id); - - /* Make sure Kamailio core sends future messages on this connection - directly to this module */ - if (con->type == PROTO_TLS) - con->type = con->rcv.proto = PROTO_WSS; - else - con->type = con->rcv.proto = PROTO_WS; + if ((wsc = wsconn_get(msg->rcv.proto_reserved1)) != NULL) + wsconn_rm(wsc); return 0; }

11 years, 9 months

git:pd/websocket: modules/websocket: improved sample kamailio. cfg for WebSockets

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: dc7fa93f2e60efd2f7d428762590fa313e3fe91f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc7fa93… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 00:02:29 2012 +0100 modules/websocket: improved sample kamailio.cfg for WebSockets --- modules/websocket/example/kamailio.cfg | 144 ++++++++++++++++++++++--------- 1 files changed, 102 insertions(+), 42 deletions(-) diff --git a/modules/websocket/example/kamailio.cfg b/modules/websocket/example/kamailio.cfg index c5bfb88..48cfa4a 100644 --- a/modules/websocket/example/kamailio.cfg +++ b/modules/websocket/example/kamailio.cfg @@ -1,32 +1,52 @@ #!KAMAILIO +# +# Simple/sample kamailio.cfg for running a proxy/registrar with TLS and +# WebSockets support. + +#!substdef "!DBURL!sqlite:///db.sqlite!g" +#!substdef "!MY_IP_ADDR!192.168.111.136!g" +#!substdef "!MY_WS_PORT!80!g" +#!substdef "!MY_WSS_PORT!443!g" +#!substdef "!MY_WS_ADDR!tcp:MY_IP_ADDR:MY_WS_PORT!g" +#!substdef "!MY_WSS_ADDR!tls:MY_IP_ADDR:MY_WSS_PORT!g" + +#!define LOCAL_TEST_RUN +#!define WITH_TLS +#!define WITH_WEBSOCKETS -#!define DBURL "sqlite:////etc/kamailio/db.sqlite" ####### Global Parameters ######### -debug=2 fork=yes children=4 -enable_tls=1 - alias="example.com" -listen=192.168.111.2:5060 -listen=tcp:192.168.111.2:80 +#!ifdef WITH_TLS +enable_tls=1 +#!endif -listen=tls:192.168.111.2:5061 -listen=tls:192.168.111.2:443 +listen=MY_IP_ADDR +#!ifdef WITH_WEBSOCKETS +listen=MY_WS_ADDR +#!ifdef WITH_TLS +listen=MY_WSS_ADDR +#!endif +#!endif tcp_connection_lifetime=3604 tcp_accept_no_cl=yes - -enable_tls=1 +tcp_rd_buf_size=16384 syn_branch=0 -#mpath="/usr/lib64/kamailio/modules_k/:/usr/lib64/kamailio/modules/" +#!ifdef LOCAL_TEST_RUN +debug=2 mpath="modules_k:modules" +#!else +debug=0 +mpath="/usr/lib64/kamailio/modules_k/:/usr/lib64/kamailio/modules/" +#!endif loadmodule "db_sqlite.so" loadmodule "tm.so" @@ -43,11 +63,16 @@ loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "auth.so" loadmodule "auth_db.so" -loadmodule "xhttp.so" loadmodule "kex.so" -loadmodule "websocket.so" loadmodule "mi_rpc.so" +#!ifdef WITH_TLS loadmodule "tls.so" +#!endif +#!ifdef WITH_WEBSOCKETS +loadmodule "xhttp.so" +loadmodule "websocket.so" +loadmodule "nathelper.so" +#!endif # ----------------- setting module-specific parameters --------------- @@ -71,51 +96,72 @@ modparam("registrar", "max_expires", 3600) modparam("registrar", "gruu_enabled", 0) # ----- usrloc params ----- -modparam("usrloc", "db_url", DBURL) +modparam("usrloc", "db_url", "DBURL") modparam("usrloc", "db_mode", 0) # ----- auth_db params ----- -modparam("auth_db", "db_url", DBURL) +modparam("auth_db", "db_url", "DBURL") modparam("auth_db", "calculate_ha1", yes) modparam("auth_db", "password_column", "password") modparam("auth_db", "load_credentials", "") -# ----- websocket params ----- -modparam("websocket", "keepalive_timeout", 30) - +#!ifdef WITH_TLS # ----- tls params ----- modparam("tls", "tls_method", "SSLv23") modparam("tls", "certificate", "CA/ser1_cert.pem") modparam("tls", "private_key", "CA/privkey.pem") modparam("tls", "ca_list", "CA/calist.pem") +#!endif -####### Routing Logic ######## +#!ifdef WITH_WEBSOCKETS +# ----- websocket params ----- +modparam("websocket", "keepalive_timeout", 30) +# ----- nathelper params ----- +modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)") +# Note: leaving NAT pings turned off here as nathelper is _only_ being used for +# WebSocket connections. NAT pings are not needed as WebSockets have +# their own keep-alives. +#!endif + + +####### Routing Logic ######## # Main SIP request routing logic # - processing of any incoming SIP request starts with this route # - note: this is the same as route { ... } request_route { - if ($rm == "OPTIONS") - { - force_rport(); - $du = "sip:192.168.111.2:5080;transport=udp"; - forward(); - exit; - } - # per request initial checks route(REQINIT); +#!ifdef WITH_WEBSOCKETS + if (nat_uac_test(64)) { + # Do NAT traversal stuff for requests from a WebSocket + # connection - even if it is not behind a NAT! + # This won't be needed in the future if Kamailio and the + # WebSocket client support outbound. + force_rport(); + if (is_method("REGISTER")) + fix_nated_register(); + else { + if (!add_contact_alias()) { + xlog("L_ERR", "Error aliasing contact <$ct>\n"); + sl_send_reply("400", "Bad Request"); + exit; + } + t_on_reply("WS_REPLY"); + } + } +#!endif + # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) # CANCEL processing - if (is_method("CANCEL")) - { + if (is_method("CANCEL")) { if (t_check_trans()) t_relay(); exit; @@ -129,14 +175,13 @@ request_route { # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) + if (is_method("INVITE")) record_route(); # handle registrations route(REGISTRAR); - if ($rU==$null) - { + if ($rU==$null) { # request with no Username in RURI sl_send_reply("484","Address Incomplete"); exit; @@ -162,8 +207,7 @@ route[REQINIT] { exit; } - if(!sanity_check("1511", "7")) - { + if(!sanity_check("1511", "7")) { xlog("Malformed SIP message from $si:$sp\n"); exit; } @@ -175,6 +219,15 @@ route[WITHINDLG] { # sequential request withing a dialog should # take the path determined by record-routing if (loose_route()) { +#!ifdef WITH_WEBSOCKETS + if ($du == "") { + if (!handle_ruri_alias()) { + xlog("L_ERR", "Bad alias <$ru>\n"); + sl_send_reply("400", "Bad Request"); + exit; + } + } +#!endif route(RELAY); } else { if ( is_method("ACK") ) { @@ -198,8 +251,7 @@ route[WITHINDLG] { # Handle SIP registrations route[REGISTRAR] { - if (is_method("REGISTER")) - { + if (is_method("REGISTER")) { if (!save("location")) sl_reply_error(); @@ -226,28 +278,35 @@ route[LOCATION] { # Authentication route route[AUTH] { - if (is_method("REGISTER") || from_uri==myself) - { + if (is_method("REGISTER") || from_uri==myself) { # authenticate requests if (!auth_check("$fd", "subscriber", "1")) { auth_challenge("$fd", "0"); exit; } # user authenticated - remove auth header - if(!is_method("REGISTER|PUBLISH")) + if(!is_method("REGISTER")) consume_credentials(); } # if caller is not local subscriber, then check if it calls # a local destination, otherwise deny, not an open relay here - if (from_uri!=myself && uri!=myself) - { + if (from_uri!=myself && uri!=myself) { sl_send_reply("403","Not relaying"); exit; } } +#!ifdef WITH_WEBSOCKETS +onreply_route[WS_REPLY] { + # Do NAT traversal stuff for replies to a WebSocket connection - even + # if it is not behind a NAT! + # This won't be needed in the future if Kamailio and the WebSocket + # client support outbound. + add_contact_alias(); +} + event_route[xhttp:request] { - if ($Rp != "80" && $Rp != "443") { + if ($Rp != MY_WS_PORT && $Rp != MY_WSS_PORT) { xlog("L_WARN", "HTTP request received on $Rp\n"); xhttp_reply("403", "Forbidden", "", ""); exit; @@ -276,3 +335,4 @@ event_route[xhttp:request] { xhttp_reply("404", "Not found", "", ""); } +#!endif

11 years, 9 months

git:pd/websocket: everything: shotgun attempt to put PROTO_WS and PROTO_WSS across core and in modules I use

by Peter Dunkley

Module: sip-router Branch: pd/websocket Commit: 1e2f18da2f2c8791f804b33e96dea043f18642bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e2f18d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sat Jun 30 00:01:07 2012 +0100 everything: shotgun attempt to put PROTO_WS and PROTO_WSS across core and in modules I use - Bound to have missed something and lots of testing required. --- forward.c | 7 ++++++- ip_addr.c | 4 ++++ modules/sanity/sanity.c | 26 ++++++++++++++++++++++++++ modules/tm/tm.c | 7 ++++++- modules/tm/ut.h | 14 +++++++++++--- modules_k/permissions/hash.c | 4 ++++ modules_k/permissions/trusted.c | 23 +++++++++++++++++++++++ modules_k/presence/subscribe.c | 6 ++++++ modules_k/presence/utils_func.h | 5 +++++ modules_k/pv/pv_core.c | 6 ++++++ modules_k/registrar/save.c | 8 ++++---- modules_k/siptrace/siptrace.c | 4 ++++ socket_info.c | 4 ++++ 13 files changed, 109 insertions(+), 9 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1e2…

11 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012