sr-dev November 2013

sr-dev@lists.kamailio.org

29 participants
220 discussions

git:3.3: usrloc: db_update contact by instance + reg_id

by Victor Seva

Module: sip-router Branch: 3.3 Commit: 5a71476e054975a659628aeec89a51a1d0a326f4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a71476… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Fri Nov 29 12:03:14 2013 +0100 usrloc: db_update contact by instance + reg_id - backport from master f67171cf3be1ade0e1c9dd013d560c87b3fd4359 --- modules_k/usrloc/ucontact.c | 155 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 153 insertions(+), 2 deletions(-) diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index ac76e9b..9b21cee 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -745,6 +745,153 @@ int db_update_ucontact(ucontact_t* _c) return 0; } +/*! + * \brief Update contact in the database by instance reg_id + * \param _c updated contact + * \return 0 on success, -1 on failure + */ +int db_update_ucontact_instance(ucontact_t* _c) +{ + db_key_t keys1[2]; + db_val_t vals1[2]; + + db_key_t keys2[13]; + db_val_t vals2[13]; + int nr_cols2; + + + if (_c->flags & FL_MEM) { + return 0; + } + + if(_c->instance.len<=0) { + LM_ERR("updating record in database failed - empty instance\n"); + return -1; + } + + keys1[0] = &instance_col; + keys1[1] = &reg_id_col; + keys2[0] = &expires_col; + keys2[1] = &q_col; + keys2[2] = &cseq_col; + keys2[3] = &flags_col; + keys2[4] = &cflags_col; + keys2[5] = &user_agent_col; + keys2[6] = &received_col; + keys2[7] = &path_col; + keys2[8] = &sock_col; + keys2[9] = &methods_col; + keys2[10] = &last_mod_col; + keys2[11] = &ruid_col; + keys2[12] = &contact_col; + + vals1[0].type = DB1_STR; + vals1[0].nul = 0; + vals1[0].val.str_val = _c->instance; + + vals1[1].type = DB1_INT; + vals1[1].nul = 0; + vals1[1].val.int_val = (int)_c->reg_id; + + vals2[0].type = DB1_DATETIME; + vals2[0].nul = 0; + vals2[0].val.time_val = _c->expires; + + vals2[1].type = DB1_DOUBLE; + vals2[1].nul = 0; + vals2[1].val.double_val = q2double(_c->q); + + vals2[2].type = DB1_INT; + vals2[2].nul = 0; + vals2[2].val.int_val = _c->cseq; + + vals2[3].type = DB1_INT; + vals2[3].nul = 0; + vals2[3].val.bitmap_val = _c->flags; + + vals2[4].type = DB1_INT; + vals2[4].nul = 0; + vals2[4].val.bitmap_val = _c->cflags; + + vals2[5].type = DB1_STR; + vals2[5].nul = 0; + vals2[5].val.str_val = _c->user_agent; + + vals2[6].type = DB1_STR; + if (_c->received.s == 0) { + vals2[6].nul = 1; + } else { + vals2[6].nul = 0; + vals2[6].val.str_val = _c->received; + } + + vals2[7].type = DB1_STR; + if (_c->path.s == 0) { + vals2[7].nul = 1; + } else { + vals2[7].nul = 0; + vals2[7].val.str_val = _c->path; + } + + vals2[8].type = DB1_STR; + if (_c->sock) { + vals2[8].val.str_val = _c->sock->sock_str; + vals2[8].nul = 0; + } else { + vals2[8].nul = 1; + } + + vals2[9].type = DB1_BITMAP; + if (_c->methods == 0xFFFFFFFF) { + vals2[9].nul = 1; + } else { + vals2[9].val.bitmap_val = _c->methods; + vals2[9].nul = 0; + } + + vals2[10].type = DB1_DATETIME; + vals2[10].nul = 0; + vals2[10].val.time_val = _c->last_modified; + + nr_cols2 = 11; + if(_c->ruid.len>0) + { + vals2[nr_cols2].type = DB1_STR; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.str_val = _c->ruid; + } else { + vals2[nr_cols2].nul = 1; + } + nr_cols2++; + + vals2[nr_cols2].type = DB1_STR; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.str_val.s = _c->c.s; + vals2[nr_cols2].val.str_val.len = _c->c.len; + nr_cols2++; + + if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { + LM_ERR("sql use_table failed\n"); + return -1; + } + + if (ul_dbf.update(ul_dbh, keys1, 0, vals1, keys2, vals2, + 2, nr_cols2) < 0) { + LM_ERR("updating database failed\n"); + return -1; + } + + if (ul_db_check_update==1 && ul_dbf.affected_rows) { + /* supposed to be an UPDATE, but if affected rows is 0, then try + * to do an INSERT */ + if(ul_dbf.affected_rows(ul_dbh)==0) { + LM_DBG("affected rows by UPDATE was 0, doing an INSERT\n"); + return db_insert_ucontact(_c); + } + } + + return 0; +} /*! * \brief Delete contact from the database @@ -909,8 +1056,12 @@ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) if (db_mode == WRITE_THROUGH || db_mode==DB_ONLY) { if (ul_db_update_as_insert) res = db_insert_ucontact(_c); - else - res = db_update_ucontact(_c); + else { + if (_c->instance.len<=0) + res = db_update_ucontact(_c); + else + res = db_update_ucontact_instance(_c); + } if (res < 0) { LM_ERR("failed to update database\n");

11 years

[tracker] Task closed: registrar: memory and db get not synced

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#351 - registrar: memory and db get not synced User who did this - Víctor Seva (linuxmaniac) Reason for closing: Fixed Additional comments about closing: Both pushed on master. I think this should be backported to 4.0, agree? More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=351 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

[tracker] Comment added: Database location table not updated correctly?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#374 - Database location table not updated correctly? User who did this - Daniel-Constantin Mierla (miconda) ---------- What version are you using? There were some updates lately related to instance handling. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=374#comment1186 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

[tracker] Task opened: Database location table not updated correctly?

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Morten Tryfoss (mtryfoss) Attached to Project - sip-router Summary - Database location table not updated correctly? Task Type - Bug Report Category - usrloc (k) Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - I'm having an issue with kamailio and a sip client on a mobile phone (using pjsip). The phone switches between wifi and mobile network, so the ip/contact of the registration changes during the day. However, the callid remains unchanged. When this happens, "kamctl ul show" returns the new contact but the database table does not. I enabled sql logging and saw that kamailio tried to update the row using "where username = xx and callid = yy and contact = <new contact header>". Of course there is no row containing that contact yet. It should add a new row instead and let the old time out? Note that it does not happen every time. I looks like it starts when the "instance"-field is not empty. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=374 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

[tracker] Comment added: Crash in TCP Read on Kamailio 4.0.1

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#364 - Crash in TCP Read on Kamailio 4.0.1 User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you make an upgrade to latest git branch 4.0 and keep MEMDBG=1? The lines reported by the backtrace don't match anymore the code for latest table 4.0 version. Quickly with git log I saw some fixes, so the issues in the websocket might have been solved, if not, it is good to get the right backtrace with the all fixes. The database and configuration file for 4.0.1 should just work with latest code from branch 4.0 (to become 4.0.5 soon) - they were only bug fixes. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=364#comment1185 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

[tracker] Comment added: Crash in TCP Read on Kamailio 4.0.1

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#364 - Crash in TCP Read on Kamailio 4.0.1 User who did this - Vitaliy Aleksandrov (Vitaliy) ---------- With MEMDBG=1 i've got the next crash: <code> (gdb) bt #0 0x00007f75cd79e425 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007f75cd7a1b8b in abort () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x000000000058c13f in qm_free (qm=<optimized out>, p=0x7f75bc2b20d8, file=<optimized out>, func=<optimized out>, line=<optimized out>) at mem/q_malloc.c:468 #3 0x00007f75c5d4267e in _wsconn_rm (wsc=<optimized out>) at ws_conn.c:140 #4 wsconn_rm (wsc=<optimized out>, run_event_route=<optimized out>) at ws_conn.c:311 #5 0x00007f75c5d448ce in encode_and_send_ws_frame (frame=<optimized out>, conn_close=<optimized out>) at ws_frame.c:298 #6 0x00007f75c5d45499 in close_connection (wsc=0x7f75bc2b20d8, type=REMOTE_CLOSE, status=<optimized out>, reason=...) at ws_frame.c:346 #7 0x00007f75c5d4749f in handle_close (frame=0x7fff99ac6320) at ws_frame.c:567 #8 ws_frame_receive (data=<optimized out>) at ws_frame.c:656 #9 0x00000000004179cc in ws_process_msg (tcpbuf=0x7f75bc939e20 "\210\202\350w\253K", <incomplete sequence \351>, len=8, rcv_info=0x7f75bc939b50, con=0x7f75bc939b38) at tcp_read.c:1146 #10 0x0000000000565092 in tcp_read_req (con=0x7f75bc939b38, bytes_read=0x7fff99ac65a0, read_flags=0x7fff99ac65b0) at tcp_read.c:1387 #11 0x0000000000566676 in handle_io (fm=<optimized out>, events=<optimized out>, idx=<optimized out>) at tcp_read.c:1559 #12 0x0000000000569914 in io_wait_loop_epoll (repeat=<optimized out>, h=<optimized out>, t=<optimized out>) at io_wait.h:1092 #13 tcp_receive_loop (unix_sock=<optimized out>) at tcp_read.c:1728 #14 0x00000000005608bc in tcp_init_children () at tcp_main.c:4959 #15 0x0000000000489855 in main_loop () at main.c:1702 #16 0x000000000041cca0 in main (argc=<optimized out>, argv=<optimized out>) at main.c:2533 </code> Last line before crash in the kamailio.log: <code> Nov 28 16:51:22 localhost kamailio[2957]: INFO: <script>: [HTTP] WebSocket connection closed [x.x.x.x:64834]. [x.x.x.x] => [-1] Nov 28 16:51:22 localhost kamailio[2957]: INFO: <core> [mem/q_malloc.c:437]: qm_free(): qm_free(0x7f75bb9a2000, 0x7f75bc2b20d8), called from websocket: ws_conn.c: _wsconn_rm(140) <code>Nov 28 16:51:22 localhost kamailio[2957]: : <core> [mem/q_malloc.c:466]: qm_free(): BUG: qm_free: freeing already freed pointer (0x7f75bc2b20d8), called from websocket: ws_conn.c: _wsconn_rm(140), first free websocket: ws_conn.c: _wsconn_rm(140) - aborting </code> Connection close message is printed from event_route[websocket:closed]. Before crash it was called two times for the same connection (counter for ip:port that i have in htable showed "-1" and shm_free() called again for the same websocket connection structure). Looks like a problem in websocket module. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=364#comment1184 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

git:master: modules/ims_registrar_scscf: added missing domain unlock

by Richard Good

Module: sip-router Branch: master Commit: f557b9c150de28966fe98dbc396703bd73e464d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f557b9c… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri Nov 29 11:59:46 2013 +0200 modules/ims_registrar_scscf: added missing domain unlock registrar_notify.c: missing domain unlock in can_subscribe_to_reg() when all checks fail --- modules/ims_registrar_scscf/registrar_notify.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index 295e3c2..d5c4bf9 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -154,7 +154,7 @@ int can_subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { ul.lock_udomain((udomain_t*) _t, &presentity_uri); res = ul.get_impurecord((udomain_t*) _t, &presentity_uri, &r); - + if (res > 0) { LM_DBG("'%.*s' Not found in usrloc\n", presentity_uri.len, presentity_uri.s); ul.unlock_udomain((udomain_t*) _t, &presentity_uri); @@ -196,7 +196,7 @@ int can_subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { c = r->contacts; while (c) { - if (c->path.len) { + if (c->path.len) { for (i = 0; i < c->path.len - asserted_id.len; i++) if (strncasecmp(c->path.s + i, asserted_id.s, asserted_id.len) == 0) { LM_DBG("Identity found in Path <%.*s>\n", @@ -208,7 +208,8 @@ int can_subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { } c = c->next; } - + + ul.unlock_udomain((udomain_t*) _t, &presentity_uri); done: if (presentity_uri.s) shm_free(presentity_uri.s);

11 years

git:tmp/ims_usrloc_pcscf_db_support: modules/ims_usrloc_pcscf: free pkg memory for reusable buffers

by Jason Penton

Module: sip-router Branch: tmp/ims_usrloc_pcscf_db_support Commit: 57b824602fbd4c5c03ec5ce00d33b9e4a0accd9d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57b8246… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Nov 29 11:50:39 2013 +0200 modules/ims_usrloc_pcscf: free pkg memory for reusable buffers --- modules/ims_usrloc_pcscf/ul_mod.c | 3 +++ modules/ims_usrloc_pcscf/usrloc_db.c | 19 ++++++++++++++++++- modules/ims_usrloc_pcscf/usrloc_db.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/modules/ims_usrloc_pcscf/ul_mod.c b/modules/ims_usrloc_pcscf/ul_mod.c index d6cda13..fd6aeb2 100644 --- a/modules/ims_usrloc_pcscf/ul_mod.c +++ b/modules/ims_usrloc_pcscf/ul_mod.c @@ -263,6 +263,9 @@ static void destroy(void) /* free callbacks list */ destroy_ulcb_list(); + free_service_route_buf(); + free_impu_buf(); + if (db_mode) destroy_db(); } diff --git a/modules/ims_usrloc_pcscf/usrloc_db.c b/modules/ims_usrloc_pcscf/usrloc_db.c index 7d55df3..4a2a416 100644 --- a/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/modules/ims_usrloc_pcscf/usrloc_db.c @@ -26,7 +26,6 @@ str public_ids_col = str_init(PUBLIC_IDS_COL); t_reusable_buffer service_route_buffer = {0,0,0}; t_reusable_buffer impu_buffer = {0,0,0}; -//char buf[2048]; int connect_db(const str *db_url) { @@ -378,4 +377,22 @@ int service_routes_as_string(struct pcontact* _c, t_reusable_buffer *buffer) { return len; } +void free_service_route_buf(void) +{ + if (service_route_buffer.buf) { + pkg_free(service_route_buffer.buf); + service_route_buffer.data_len = 0; + service_route_buffer.buf_len = 0; + service_route_buffer.buf = 0; + } +} + +void free_impu_buf(void) { + if (impu_buffer.buf) { + pkg_free(impu_buffer.buf); + impu_buffer.data_len = 0; + impu_buffer.buf_len = 0; + impu_buffer.buf = 0; + } +} diff --git a/modules/ims_usrloc_pcscf/usrloc_db.h b/modules/ims_usrloc_pcscf/usrloc_db.h index 61869f2..fbe8e28 100644 --- a/modules/ims_usrloc_pcscf/usrloc_db.h +++ b/modules/ims_usrloc_pcscf/usrloc_db.h @@ -96,6 +96,9 @@ int connect_db(const str *db_url); int impus_as_string(struct pcontact* _c, t_reusable_buffer* buffer); int service_routes_as_string(struct pcontact* _c, t_reusable_buffer *buffer); +void free_service_route_buf(void); +void free_impu_buf(void); + int db_insert_pcontact(pcontact_t* _c); int db_delete_pcontact(pcontact_t* _c); int db_update_pcontact(pcontact_t* _c);

11 years

[tracker] Comment added: Crash in TCP Read on Kamailio 4.0.1

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#364 - Crash in TCP Read on Kamailio 4.0.1 User who did this - Vitaliy Aleksandrov (Vitaliy) ---------- With MEMDBG=1 i've got the next crash: <code> (gdb) bt #0 0x00007f75cd79e425 in raise () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007f75cd7a1b8b in abort () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x000000000058c13f in qm_free (qm=<optimized out>, p=0x7f75bc2b20d8, file=<optimized out>, func=<optimized out>, line=<optimized out>) at mem/q_malloc.c:468 #3 0x00007f75c5d4267e in _wsconn_rm (wsc=<optimized out>) at ws_conn.c:140 #4 wsconn_rm (wsc=<optimized out>, run_event_route=<optimized out>) at ws_conn.c:311 #5 0x00007f75c5d448ce in encode_and_send_ws_frame (frame=<optimized out>, conn_close=<optimized out>) at ws_frame.c:298 #6 0x00007f75c5d45499 in close_connection (wsc=0x7f75bc2b20d8, type=REMOTE_CLOSE, status=<optimized out>, reason=...) at ws_frame.c:346 #7 0x00007f75c5d4749f in handle_close (frame=0x7fff99ac6320) at ws_frame.c:567 #8 ws_frame_receive (data=<optimized out>) at ws_frame.c:656 #9 0x00000000004179cc in ws_process_msg (tcpbuf=0x7f75bc939e20 "\210\202\350w\253K", <incomplete sequence \351>, len=8, rcv_info=0x7f75bc939b50, con=0x7f75bc939b38) at tcp_read.c:1146 #10 0x0000000000565092 in tcp_read_req (con=0x7f75bc939b38, bytes_read=0x7fff99ac65a0, read_flags=0x7fff99ac65b0) at tcp_read.c:1387 #11 0x0000000000566676 in handle_io (fm=<optimized out>, events=<optimized out>, idx=<optimized out>) at tcp_read.c:1559 #12 0x0000000000569914 in io_wait_loop_epoll (repeat=<optimized out>, h=<optimized out>, t=<optimized out>) at io_wait.h:1092 #13 tcp_receive_loop (unix_sock=<optimized out>) at tcp_read.c:1728 #14 0x00000000005608bc in tcp_init_children () at tcp_main.c:4959 #15 0x0000000000489855 in main_loop () at main.c:1702 #16 0x000000000041cca0 in main (argc=<optimized out>, argv=<optimized out>) at main.c:2533 </code> Last line before crash in the kamailio.log: <code> Nov 28 16:51:22 localhost kamailio[2957]: INFO: <script>: [HTTP] WebSocket connection closed [x.x.x.x:64834]. [x.x.x.x] => [-1] Nov 28 16:51:22 localhost kamailio[2957]: INFO: <core> [mem/q_malloc.c:437]: qm_free(): qm_free(0x7f75bb9a2000, 0x7f75bc2b20d8), called from websocket: ws_conn.c: _wsconn_rm(140) <code>Nov 28 16:51:22 localhost kamailio[2957]: : <core> [mem/q_malloc.c:466]: qm_free(): BUG: qm_free: freeing already freed pointer (0x7f75bc2b20d8), called from websocket: ws_conn.c: _wsconn_rm(140), first free websocket: ws_conn.c: _wsconn_rm(140) - aborting </code> Connection close message is printed from event_route[websocket:closed]. Before crash it was called two times for the same connection (counter for ip:port that i have in htable showed "-1" and shm_free() called again for the same websocket connection structure). Looks like a problem in websocket module. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=364#comment1183 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

11 years

git:tmp/ims_usrloc_pcscf_db_support: modules/ims_usrloc_pcscf: removed commented code

by Jason Penton

Module: sip-router Branch: tmp/ims_usrloc_pcscf_db_support Commit: a72d58f85c75bb1b70b170f7aeda2a8952dc2296 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a72d58f… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Nov 29 11:11:53 2013 +0200 modules/ims_usrloc_pcscf: removed commented code --- modules/ims_usrloc_pcscf/usrloc_db.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/ims_usrloc_pcscf/usrloc_db.c b/modules/ims_usrloc_pcscf/usrloc_db.c index 6c0fb87..7d55df3 100644 --- a/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/modules/ims_usrloc_pcscf/usrloc_db.c @@ -99,8 +99,6 @@ int use_location_pcscf_table(str* domain) int db_update_pcontact(pcontact_t* _c) { -// char buf[2048]; //TODO: use re-usable pkg mem... -// char buf2[2048]; //TODO: use re-usable pkg mem... str impus, service_routes; db_val_t match_values[1]; @@ -207,8 +205,6 @@ int db_delete_pcontact(pcontact_t* _c) int db_insert_pcontact(struct pcontact* _c) { str empty_str = str_init(""); - char buf[2048]; //TODO: use re-usable pkg mem... - char buf2[2048]; //TODO: use re-usable pkg mem... str impus, service_routes; db_key_t keys[13] = { @@ -223,7 +219,6 @@ int db_insert_pcontact(struct pcontact* _c) }; db_val_t values[13]; -// VAL_TYPE(GET_FIELD_IDX(values, LP_ID_IDX)) = DB1_INT; VAL_TYPE(GET_FIELD_IDX(values, LP_DOMAIN_IDX)) = DB1_STR; VAL_TYPE(GET_FIELD_IDX(values, LP_AOR_IDX)) = DB1_STR; VAL_TYPE(GET_FIELD_IDX(values, LP_CONTACT_IDX)) = DB1_STR; @@ -279,13 +274,13 @@ int db_insert_pcontact(struct pcontact* _c) /* add the public identities */ impus.len = impus_as_string(_c, &impu_buffer); - impus.s = buf; + impus.s = impu_buffer.buf; SET_PROPER_NULL_FLAG(impus, values, LP_PUBLIC_IPS_IDX); SET_STR_VALUE(GET_FIELD_IDX(values, LP_PUBLIC_IPS_IDX), impus); /* add service routes */ service_routes.len = service_routes_as_string(_c, &service_route_buffer); - service_routes.s = buf2; + service_routes.s = service_route_buffer.buf; SET_PROPER_NULL_FLAG(service_routes, values, LP_PUBLIC_IPS_IDX); SET_STR_VALUE(GET_FIELD_IDX(values, LP_PUBLIC_IPS_IDX), service_routes); @@ -378,7 +373,6 @@ int service_routes_as_string(struct pcontact* _c, t_reusable_buffer *buffer) { p+=_c->service_routes[i].len; *p = '>'; p++; -// len += _c->service_routes[i].len + 2; } return len;

11 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2013