sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
251 discussions

git:master: dialog(k): proper local linking of profile before dlg is created
by Daniel-Constantin Mierla 15 Jun '12

15 Jun '12

Module: sip-router Branch: master Commit: 80c4f4b1d9ff31e79c999b82db35c3b9abc56e22 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=80c4f4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 15 17:17:07 2012 +0200 dialog(k): proper local linking of profile before dlg is created - reported by Nick R. --- modules_k/dialog/dlg_profile.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c index c8e3150..70ec2c5 100644 --- a/modules_k/dialog/dlg_profile.c +++ b/modules_k/dialog/dlg_profile.c @@ -468,6 +468,13 @@ int set_dlg_profile(struct sip_msg *msg, str *value, struct dlg_profile_table *p /* add linker directly to the dialog and profile */ link_dlg_profile( linker, dlg); } else { + /* if existing linkers are not from current request, just discard them */ + if (msg->id!=current_dlg_msg_id || msg->pid!=current_dlg_msg_pid) { + current_dlg_msg_id = msg->id; + current_dlg_msg_pid = msg->pid; + destroy_linkers(current_pending_linkers); + current_pending_linkers = NULL; + } /* no dialog yet -> set linker as pending */ if (msg->id!=current_dlg_msg_id || msg->pid!=current_dlg_msg_pid) { current_dlg_msg_id = msg->id;

1 0

git:pd/websocket: modules/websocket: Improvements to handshake handler
by Peter Dunkley 15 Jun '12

15 Jun '12

Module: sip-router Branch: pd/websocket Commit: 407130579cb10620480e8800558375094aaf07be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4071305… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 15 10:17:06 2012 +0100 modules/websocket: Improvements to handshake handler --- modules/websocket/ws_handshake.c | 81 +++++++++++++++++++++++++++++--------- 1 files changed, 62 insertions(+), 19 deletions(-) diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index 313187c..b46094f 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -34,16 +34,29 @@ #define WS_VERSION (13) -#define SEC_WEBSOCKET_KEY (1<<0) -#define SEC_WEBSOCKET_PROTOCOL (1<<1) -#define SEC_WEBSOCKET_VERSION (1<<2) - -#define REQUIRED_HEADERS (SEC_WEBSOCKET_KEY | SEC_WEBSOCKET_PROTOCOL\ - | SEC_WEBSOCKET_VERSION) - static str str_sip = str_init("sip"); +static str str_websocket = str_init("websocket"); static str str_ws_guid = str_init("258EAFA5-E914-47DA-95CA-C5AB0DC85B11"); +/* HTTP headers */ +static str str_connection = str_init("Connection"); +static str str_upgrade = str_init("Upgrade"); +static str str_sec_websocket_accept = str_init("Sec-WebSocket-Accept"); +static str str_sec_websocket_key = str_init("Sec-WebSocket-Key"); +static str str_sec_websocket_protocol = str_init("Sec-WebSocket-Protocol"); +static str str_sec_websocket_version = str_init("Sec-WebSocket-Init"); +#define CONNECTION (1<<0) +#define UPGRADE (1<<1) +#define SEC_WEBSOCKET_ACCEPT (1<<2) +#define SEC_WEBSOCKET_KEY (1<<3) +#define SEC_WEBSOCKET_PROTOCOL (1<<4) +#define SEC_WEBSOCKET_VERSION (1<<5) + +#define REQUIRED_HEADERS (CONNECTION | UPGRADE | SEC_WEBSOCKET_KEY\ + | SEC_WEBSOCKET_PROTOCOL\ + | SEC_WEBSOCKET_VERSION) + +/* HTTP response text */ static str str_switching_protocols = str_init("Switching Protocols"); static str str_bad_request = str_init("Bad Request"); static str str_upgrade_required = str_init("Upgrade Required"); @@ -85,9 +98,26 @@ int ws_handle_handshake(struct sip_msg *msg) while (hdr != NULL) { - /* Decode and validate Sec-WebSocket-Key */ + /* Decode and validate Connection */ if (cmp_hdrname_strzn(&hdr->name, - "Sec-WebSocket-Key", 17) == 0) + str_connection.s, + str_connection.len) == 0) + { + /* TODO: validate Connection body */ + hdr_flags |= CONNECTION; + } + /* Decode and validate Upgrade */ + else if (cmp_hdrname_strzn(&hdr->name, + str_upgrade.s, + str_upgrade.len) == 0) + { + /* TODO: validate Upgrade body */ + hdr_flags |= UPGRADE; + } + /* Decode and validate Sec-WebSocket-Key */ + else if (cmp_hdrname_strzn(&hdr->name, + str_sec_websocket_key.s, + str_sec_websocket_key.len) == 0) { if (hdr_flags & SEC_WEBSOCKET_KEY) { @@ -102,14 +132,17 @@ int ws_handle_handshake(struct sip_msg *msg) } /* Decode and validate Sec-WebSocket-Protocol */ else if (cmp_hdrname_strzn(&hdr->name, - "Sec-WebSocket-Protocol", 22) == 0) + str_sec_websocket_protocol.s, + str_sec_websocket_protocol.len) == 0) { + /* TODO: better validation of sip... */ if (str_search(&hdr->body, &str_sip) != NULL) hdr_flags |= SEC_WEBSOCKET_PROTOCOL; } /* Decode and validate Sec-WebSocket-Version */ else if (cmp_hdrname_strzn(&hdr->name, - "Sec-WebSocket-Version", 21) == 0) + str_sec_websocket_version.s, + str_sec_websocket_version.len) == 0) { if (hdr_flags & SEC_WEBSOCKET_VERSION) { @@ -127,7 +160,9 @@ int ws_handle_handshake(struct sip_msg *msg) hdr->body.len, hdr->body.s); headers.s = headers_buf; headers.len = snprintf(headers.s, HDR_BUF_LEN, - "Sec-WebSocket-Version: %u\r\n", + "%.*s: %d\r\n", + str_sec_websocket_version.len, + str_sec_websocket_version.s, WS_VERSION); ws_send_reply(msg, 426, &str_upgrade_required, &headers); @@ -143,7 +178,13 @@ int ws_handle_handshake(struct sip_msg *msg) /* Final check that all required headers/values were found */ if (hdr_flags != REQUIRED_HEADERS) { - LM_WARN("all required headers not present\n"); + LM_WARN("required headers not present\n"); + headers.s = headers_buf; + headers.len = snprintf(headers.s, HDR_BUF_LEN, + "%.*s: %.*s\r\n" + "%.*s: %d\r\n", + str_sec_websocket_protocol.len, str_sec_websocket_protocol.s, str_sip.len, str_sip.s, + str_sec_websocket_version.len, str_sec_websocket_version.s, WS_VERSION); ws_send_reply(msg, 400, &str_bad_request, NULL); return 0; } @@ -169,12 +210,14 @@ int ws_handle_handshake(struct sip_msg *msg) /* Build headers for reply */ headers.s = headers_buf; headers.len = snprintf(headers.s, HDR_BUF_LEN, - "Sec-WebSocket-Key: %.*s\r\n" - "Sec-WebSocket-Protocol: %.*s\r\n" - "Sec-WebSocket-Version: %u\r\n", - reply_key.len, reply_key.s, - str_sip.len, str_sip.s, - WS_VERSION); + "%.*s: %.*s\r\n" + "%.*s: %.*s\r\n" + "%.*s: %.*s\r\n" + "%.*s: %.*s\r\n", + str_upgrade.len, str_upgrade.s, str_websocket.len, str_websocket.s, + str_connection.len, str_connection.s, str_upgrade.len, str_upgrade.s, + str_sec_websocket_accept.len, str_sec_websocket_accept.s, reply_key.len, reply_key.s, + str_sec_websocket_protocol.len, str_sec_websocket_protocol.s, str_sip.len, str_sip.s); /* TODO: make sure Kamailio core sends future requests on this connection directly to this module */

1 0

git:pd/websocket: modules/websocket: First attempt a module for websocket support
by Peter Dunkley 14 Jun '12

14 Jun '12

Module: sip-router Branch: pd/websocket Commit: 48ba74772c398396e54a3cbb2d6cee9f4065d599 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48ba747… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jun 15 00:40:28 2012 +0100 modules/websocket: First attempt a module for websocket support - So far this is: - Module boiler-plate - WebSocket handshake - Example/test kamailio.cfg --- modules/websocket/Makefile | 27 ++++ modules/websocket/example/kamailio.cfg | 252 ++++++++++++++++++++++++++++++++ modules/websocket/ws_handshake.c | 186 +++++++++++++++++++++++ modules/websocket/ws_handshake.h | 31 ++++ modules/websocket/ws_mod.c | 82 +++++++++++ modules/websocket/ws_mod.h | 35 +++++ 6 files changed, 613 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=48b…

1 0

Testing GRUU in Kamailio 3.3.
by José Luis Millán 14 Jun '12

14 Jun '12

Hi, Trying the GRUU implementation on Registrar module (Kamailio Version 3.3), I found that the proxy does not rewrite the Request URI for in-dialog requests as stated in RFC 5627 6.2. ++++ If the Request-URI contains the "gr" URI parameter and is equivalent, based on URI comparison, to a GRUU which is currently valid within the domain, processing proceeds as it would for any other URI present in the location service, as defined in Section 16.5 of RFC 3261 [1], except that the "gr" URI parameter is not removed as part of the canonicalization process. This is the case for both out-of-dialog requests targeted to the GRUU, and mid-dialog requests targeted to the GRUU (in which case the incoming request would have a Route header field value containing the URI that the proxy used for record- routing.). Note that the "gr" URI parameter is retained just for the purposes of finding the GRUU in the location service; if a match is found, the Request-URI will be rewritten with the registered contacts, replacing the GRUU and its "gr" URI parameter. The "gr" URI parameter is not carried forward into the rewritten Request-URI. ++++ Here an in-dialog MESSAGE coming to Kamailio and routed-out. The incoming request URI has the 'gr' parameter and also has the outgoing request, which should be rewritten with the registered contact (which hasn't got the 'gr' parameter) . ++++ MESSAGE sip:one@mydomain;gr=urn:uuid:820e1a10-ffc9-44fd-ae36-2009d835deaf SIP/2.0' Route: <sip:KAMAILIO;transport=tcp;lr=on>' Route: <sip:OUTBOUND_PROXY:9090;transport=tcp;lr;ovid=fef2d723>' Route: <sip:f2abb14cb6@OUTBOUND_PROXY:10080;transport=ws;lr;ovid=fef2d723>' Via: SIP/2.0/TCP OUTBOUND_PROXY:9090;branch=z9hG4bK1b8e92e2b075b4fcb9f177ab9ea732ca88ac6221;rport' Via: SIP/2.0/TCP 192.32.232.12;branch=z9hG4bK3609852;received=PUBLIC_IP' Max-Forwards: 8' To: sip:one@mydomain;tag=9y5zyjjrqb' From: sip:jmillan@mydomain;tag=243wxuykw0' Call-ID: b9q6ixruxbbt2ej5opqf' CSeq: 3570 MESSAGE' Content-Type: text/plain' User-Agent: JsSIP 0.1.0' Content-Length: 7' ' lalaiii MESSAGE sip:one@mydomain;gr=urn:uuid:820e1a10-ffc9-44fd-ae36-2009d835deaf SIP/2.0' Route: <sip:OUTBOUND_PROXY:9090;transport=tcp;lr;ovid=fef2d723>' Route: <sip:f2abb14cb6@OUTBOUND_PROXY:10080;transport=ws;lr;ovid=fef2d723>' Via: SIP/2.0/TCP KAMAILIO;branch=z9hG4bKf316.d94709f5.0;i=2' Via: SIP/2.0/TCP OUTBOUND_PROXY:9090;branch=z9hG4bK1b8e92e2b075b4fcb9f177ab9ea732ca88ac6221;rport=39080' Via: SIP/2.0/TCP 192.32.232.12;branch=z9hG4bK3609852;received=PUBLIC_IP' Max-Forwards: 7' To: sip:one@mydomain;tag=9y5zyjjrqb' From: sip:jmillan@mydomain;tag=243wxuykw0' Call-ID: b9q6ixruxbbt2ej5opqf' CSeq: 3570 MESSAGE' Content-Type: text/plain' User-Agent: JsSIP 0.1.0' Content-Length: 7' ' lalaiii ++++ Regards.

3 3

git:3.3: pua: remove wrong free of TM callback param in send_publish()
by Daniel-Constantin Mierla 14 Jun '12

14 Jun '12

Module: sip-router Branch: 3.3 Commit: d772b44f8fee63043afb6aa1d0e3442d7295f2a3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d772b44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jun 14 12:24:36 2012 +0200 pua: remove wrong free of TM callback param in send_publish() - reported by Charles Chance and Juha Heinanen (cherry picked from commit 1d89d7bea854c2e2c646b5d13ba215795325b50f) --- modules_k/pua/send_publish.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/modules_k/pua/send_publish.c b/modules_k/pua/send_publish.c index cfc759f..3bc8702 100644 --- a/modules_k/pua/send_publish.c +++ b/modules_k/pua/send_publish.c @@ -695,15 +695,24 @@ done: goto error; } } + goto finish; error: - if(etag.s) - pkg_free(etag.s); - + ret = -1; if(cb_param) shm_free(cb_param); - if(body&& ret_code) + if (dbmode == PUA_DB_ONLY && pua_dbf.abort_transaction) + { + if (pua_dbf.abort_transaction(pua_db) < 0) + LM_ERR("in abort_transaction\n"); + } + +finish: + if(etag.s) + pkg_free(etag.s); + + if(body && ret_code) { if(body->s) xmlFree(body->s); @@ -719,12 +728,6 @@ error: } free_results_puadb(res); - if (dbmode == PUA_DB_ONLY && pua_dbf.abort_transaction) - { - if (pua_dbf.abort_transaction(pua_db) < 0) - LM_ERR("in abort_transaction\n"); - } - return ret; }

2 1

3.3 presence crash
by Juha Heinanen 14 Jun '12

14 Jun '12

when doing jitsi presence tests, i also managed to get kamailio 3.3 to crash with core dump. events leading to the crash were pua publish via xmlrpc, which resulted into punch of notifies, some of which sip proxy failed to deliver due to missing tcp connections. after generating the notifies, presence server crashed like this: #0 0x00007fa1e9b17f7b in core_hash () from /usr/lib/pres-serv/modules_k/pua.so #1 0x00007fa1e9b1933f in publ_cback_func () from /usr/lib/pres-serv/modules_k/pua.so #2 0x00007fa1ee59b907 in run_trans_callbacks_internal () from /usr/lib/pres-serv/modules/tm.so #3 0x00007fa1ee59ba19 in run_trans_callbacks () from /usr/lib/pres-serv/modules/tm.so #4 0x00007fa1ee5c36fa in local_reply () from /usr/lib/pres-serv/modules/tm.so #5 0x00007fa1ee5c4b30 in reply_received () from /usr/lib/pres-serv/modules/tm.so #6 0x000000000044fee5 in forward_reply () #7 0x0000000000489180 in receive_msg () #8 0x0000000000501a8c in receive_tcp_msg () #9 0x0000000000502740 in tcp_read_req () #10 0x0000000000503759 in handle_io () #11 0x00000000004fe363 in io_wait_loop_epoll () #12 0x0000000000504431 in tcp_receive_loop () #13 0x00000000004f9920 in tcp_init_children () #14 0x000000000045c9fb in main_loop () #15 0x000000000045f29c in main () it would be nice to get this fixed before 3.3 release. -- juha

4 22

git:3.3: modules_k/pua: send_publish() doesn' t work correctly in DB only mode with certain DBs
by Peter Dunkley 14 Jun '12

14 Jun '12

Module: sip-router Branch: 3.3 Commit: 3a32ca895bf326bf16454705a294d17bd6a2f539 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a32ca8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 14 17:41:49 2012 +0100 modules_k/pua: send_publish() doesn't work correctly in DB only mode with certain DBs - The pua record wasn't getting inserted in some cases - Looks like I removed a couple of lines I shouldn't have when merging from Crocodile's internal SVN repository to git - Issue found by Hugh Waite @ Crocodile RCS and fixed by Hugh Waite and Peter Dunkley @ Crocodile RCS (cherry picked from commit 78da4d35dfceaa3d167d2b5ad66f1a27bc0f4628) --- modules_k/pua/pua_db.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index c064c25..05dd1e3 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -989,6 +989,9 @@ int update_record_puadb(ua_pres_t *pres, int expires, str *etag) return -1; } + if (pua_dbf.affected_rows != NULL) + return pua_dbf.affected_rows(pua_db); + return 1; }

1 0

git:3.3: modules_k/presence: partial NOTIFYs for presence. winfo not correctly formed when using notifier processes
by Peter Dunkley 14 Jun '12

14 Jun '12

Module: sip-router Branch: 3.3 Commit: 144e2e3408928971cdd78ec6cf787774c5c9fedd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=144e2e3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 14 17:43:54 2012 +0100 modules_k/presence: partial NOTIFYs for presence.winfo not correctly formed when using notifier processes - I seem to have broken things when I did a pre-merge re-order/clean-up of the code - Issue found by Hugh Waite @ Crocodile RCS and fixed by Hugh Waite and Peter Dunkley @ Crocodile RCS (cherry picked from commit 5ed96d257f2d402597a678e4451fd9011786f4a2) --- modules_k/presence/notify.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 91bdc46..73675e1 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -2513,25 +2513,6 @@ static int notifier_notify(subs_t *sub, int *updated, int *end_transaction) { if (sub->event->type & WINFO_TYPE) /* presence.winfo dialog */ { - if (unset_watchers_updated_winfo(&sub->pres_uri) < 0) - { - LM_WARN("resetting updated_winfo flags\n"); - - if (pa_dbf.abort_transaction) - { - if (pa_dbf.abort_transaction(pa_db) < 0) - { - LM_ERR("in abort_transaction\n"); - goto error; - } - } - *end_transaction = 0; - - /* Make sure this gets tried again next time */ - *updated = 1; - goto done; - } - if (sub->updated_winfo == NO_UPDATE_TYPE) { /* Partial notify if @@ -2565,6 +2546,26 @@ static int notifier_notify(subs_t *sub, int *updated, int *end_transaction) } else /* Full presence.winfo NOTIFY */ sub->updated_winfo = NO_UPDATE_TYPE; + + if (unset_watchers_updated_winfo(&sub->pres_uri) < 0) + { + LM_WARN("resetting updated_winfo flags\n"); + + if (pa_dbf.abort_transaction) + { + if (pa_dbf.abort_transaction(pa_db) < 0) + { + LM_ERR("in abort_transaction\n"); + goto error; + } + } + *end_transaction = 0; + + /* Make sure this gets tried again next time */ + *updated = 1; + goto done; + } + } else if (sub->event->type & PUBL_TYPE) {

1 0

git:master: modules_k/presence: partial NOTIFYs for presence. winfo not correctly formed when using notifier processes
by Peter Dunkley 14 Jun '12

14 Jun '12

Module: sip-router Branch: master Commit: 5ed96d257f2d402597a678e4451fd9011786f4a2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ed96d2… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 14 17:43:54 2012 +0100 modules_k/presence: partial NOTIFYs for presence.winfo not correctly formed when using notifier processes - I seem to have broken things when I did a pre-merge re-order/clean-up of the code - Issue found by Hugh Waite @ Crocodile RCS and fixed by Hugh Waite and Peter Dunkley @ Crocodile RCS --- modules_k/presence/notify.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 91bdc46..73675e1 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -2513,25 +2513,6 @@ static int notifier_notify(subs_t *sub, int *updated, int *end_transaction) { if (sub->event->type & WINFO_TYPE) /* presence.winfo dialog */ { - if (unset_watchers_updated_winfo(&sub->pres_uri) < 0) - { - LM_WARN("resetting updated_winfo flags\n"); - - if (pa_dbf.abort_transaction) - { - if (pa_dbf.abort_transaction(pa_db) < 0) - { - LM_ERR("in abort_transaction\n"); - goto error; - } - } - *end_transaction = 0; - - /* Make sure this gets tried again next time */ - *updated = 1; - goto done; - } - if (sub->updated_winfo == NO_UPDATE_TYPE) { /* Partial notify if @@ -2565,6 +2546,26 @@ static int notifier_notify(subs_t *sub, int *updated, int *end_transaction) } else /* Full presence.winfo NOTIFY */ sub->updated_winfo = NO_UPDATE_TYPE; + + if (unset_watchers_updated_winfo(&sub->pres_uri) < 0) + { + LM_WARN("resetting updated_winfo flags\n"); + + if (pa_dbf.abort_transaction) + { + if (pa_dbf.abort_transaction(pa_db) < 0) + { + LM_ERR("in abort_transaction\n"); + goto error; + } + } + *end_transaction = 0; + + /* Make sure this gets tried again next time */ + *updated = 1; + goto done; + } + } else if (sub->event->type & PUBL_TYPE) {

1 0

git:master: modules_k/pua: send_publish() doesn' t work correctly in DB only mode with certain DBs
by Peter Dunkley 14 Jun '12

14 Jun '12

Module: sip-router Branch: master Commit: 78da4d35dfceaa3d167d2b5ad66f1a27bc0f4628 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78da4d3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jun 14 17:41:49 2012 +0100 modules_k/pua: send_publish() doesn't work correctly in DB only mode with certain DBs - The pua record wasn't getting inserted in some cases - Looks like I removed a couple of lines I shouldn't have when merging from Crocodile's internal SVN repository to git - Issue found by Hugh Waite @ Crocodile RCS and fixed by Hugh Waite and Peter Dunkley @ Crocodile RCS --- modules_k/pua/pua_db.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index c064c25..05dd1e3 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -989,6 +989,9 @@ int update_record_puadb(ua_pres_t *pres, int expires, str *etag) return -1; } + if (pua_dbf.affected_rows != NULL) + return pua_dbf.affected_rows(pua_db); + return 1; }

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012