sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

Start a nNew thread

send_fast_notify on in-dialog subscribe

by Luis Azedo

Hi Daniel, send_fast_notify = 0 is not being honored on in-dialog SUBSCRIBE (RESUBSCRIBE). is that by design ? Thanks

9 years, 10 months

[kamailio] websocket: Check frame->wsc in ws_frame_transmit for NULL. (#26)

by Walter Doekes

Add frame.wsc == NULL check in ws_frame_transmit similar to the checks in ws_close and friends and ws_frame_receive to avoid crashing if the tcp connection was been terminated prematurely. In the wild, the following was observed: Jan 11 16:26:20 ws0 /usr/sbin/kamailio[16621]: ERROR: <core> [tcp_main.c:715]: _wbufq_add(): ERROR: wbufq_add(1077 bytes): write queue full or timeout (32122, total 32122, last write 0 s ago) Jan 11 16:26:20 ws0 /usr/sbin/kamailio[16621]: ERROR: websocket [ws_frame.c:299]: encode_and_send_ws_frame(): sending WebSocket frame Jan 11 16:26:20 ws0 /usr/sbin/kamailio[16621]: ERROR: websocket [ws_frame.c:740]: ws_frame_transmit(): sending message .... Jan 11 16:26:20 ws0 /usr/sbin/kamailio[16637]: ERROR: <core> [tcp_main.c:3638]: handle_ser_child(): handle_ser_child: ERROR: received CON_ERROR for 0x7fc500606808 (id 3492), refcnt 3, flags 0x601c Jan 11 16:26:20 ws0 /usr/sbin/kamailio[16628]: WARNING: <core> [tcp_read.c:1604]: handle_io(): WARNING: tcp_receive: handle_io: F_TCPCONN connection marked as bad: 0x7fc500606808 id 3492 refcnt 1 And then, 5 seconds later: Jan 11 16:26:25 ws0 /usr/sbin/kamailio[16612]: ALERT: <core> [main.c:777]: handle_sigs(): child process 16618 exited by a signal 11 Backtrace: #0 0x00007f8694ee4bfe in encode_and_send_ws_frame (frame=frame@entry=0x7fff1a295130, conn_close=conn_close@entry=CONN_CLOSE_DONT) at ws_frame.c:148 #1 0x00007f8694ee9598 in ws_frame_transmit (data=<optimized out>) at ws_frame.c:738 #2 0x00007f8695fc3e20 in msg_send (len=<optimized out>, buf=<optimized out>, dst=<optimized out>) at ../../forward.h:187 #3 send_pr_buffer (rb=rb@entry=0x7f86888730b0, buf=0x7f8688883388, len=<optimized out>) at t_funcs.c:102 #4 0x00007f8695fcf104 in t_send_branch (t=t@entry=0x7f8688872f38, branch=branch@entry=0, p_msg=p_msg@entry=0x7f86976212b0, proxy=proxy@entry=0x0, lock_replies=lock_replies@entry=1) at t_fwd.c:1580 #5 0x00007f8695fd2814 in t_forward_nonack (t=0x7f8688872f38, p_msg=p_msg@entry=0x7f86976212b0, proxy=proxy@entry=0x0, proto=proto@entry=0) at t_fwd.c:1790 #6 0x00007f8695fc50fa in t_relay_to (p_msg=0x7f86976212b0, proxy=0x0, proto=0, replicate=0) at t_funcs.c:354 #7 0x0000000000421980 in do_action (h=h@entry=0x7fff1a295c70, a=a@entry=0x7f86975e3798, msg=msg@entry=0x7f86976212b0) at action.c:1105 The same thing happened three times over the weekend. All with kamailio-4.1.6 from http://deb.kamailio.org/kamailio . Could it be that this missing check was simply an oversight? Or is there a reason why the check wasn't done in ws_frame_transmit? ---- This patch was compile tested only. We haven't tried to reproduce the crash to see if this fixes it. But I figure this should at least stop the crash, and probably relay back that the destination doesn't exist anymore. You can merge this Pull Request by running: git pull https://github.com/wdoekes/kamailio wjd-ws_frame_transmit-check-wsc Or you can view, comment on it, or merge it online at: https://github.com/kamailio/kamailio/pull/26 -- Commit Summary -- * websocket: Check frame->wsc in ws_frame_transmit for NULL. -- File Changes -- M modules/websocket/ws_frame.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/26.patch https://github.com/kamailio/kamailio/pull/26.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/26

9 years, 10 months

git: new commits in branch 4.1

by Daniel-Constantin Mierla

- URL: https://github.com/kamailio/kamailio/commit/e3807707f9d61ab61364ca9dcb1f88d… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:24:02+01:00 tm: Fix setting flags for record-route headers The flags where set in add_uac() by counting the number of record-route headers added by prepare_new_uac(). The latter function backups and restores the list of lumps, so add_uac() only sees the original list, which is not what has happened on the branch being handled. Moving setting the flags into prepare_new_uac() fixes this. This fixed the dialog module, which has to remove the correct number of RR headers from the callee's routeset (which it does based on the tm flags). (cherry picked from commit ee9b78709516b935e087b0efcb620c13aad1a740) (cherry picked from commit d68066614211d1a406c0c12f11ce907340e42255) - URL: https://github.com/kamailio/kamailio/commit/ce483e8cae0b163bf0c8816b3b58f97… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:24:18+01:00 kcore: print_rr_body: return number of printed Record-Route bodies Act like the documentation, return the number of printed RR bodies, not the total number of RR bodies. (cherry picked from commit aa4fabe05dd3b6dc841325fe279596293d327a92) (cherry picked from commit ae01e2ed5e7decace416fefbfd64073ffd3d62ac) - URL: https://github.com/kamailio/kamailio/commit/9e72cd630ff1b5c180ecf85187b0d51… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:24:33+01:00 core: sip_msg_shm_clone: clone parsed maxforwards value in shm maxfwd module modified the msg buf directly instead of adding a lump. In addition it is filling the parsed value of the header field. Clone this field into shm so later code can at least determine if the msg has been mangled so it can retreive the original value of the header. (cherry picked from commit 42f506c08073c5f8ca84f1f12ea9e6c820f162d8) (cherry picked from commit a7ab7030ea0f5afb08009985a245e1499e1f8517) - URL: https://github.com/kamailio/kamailio/commit/2e64885da313c5978e663414154cf39… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:25:07+01:00 core: Document the right type for 'str*' in the RPC interface (cherry picked from commit a4eacbb469909978b7a9eff8767dcbdd5110ee99) (cherry picked from commit 293d7cb86bc1c59ede155dfbcf8627ccfcbc1710) - URL: https://github.com/kamailio/kamailio/commit/a3a3766c3fb3e54ece5977c7a94cca2… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:25:25+01:00 mi_datagram: Send error response on out-of-memory (cherry picked from commit 902a77af1501f78fcc1205a37a5307e1d300f301) (cherry picked from commit 9cc499e8350ee8f37dfb844c02497d7233e146d1) - URL: https://github.com/kamailio/kamailio/commit/9bfbccfd497990a2605d03bf21c2b6f… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:26:03+01:00 tm: log an error message as error, not debug (cherry picked from commit 54f19e018a1a569b532555311505d4962de49bd7) (cherry picked from commit 50c60c511259bff8c8e782f949547a9f0967c5c6) - URL: https://github.com/kamailio/kamailio/commit/5f1dfee0b84859d81e7a2d3c8a2f018… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:26:47+01:00 tm: remove dead code (cherry picked from commit 3d24997fd1ba34bd4e426656b1533530718008a0) (cherry picked from commit 0c7df3a8375ee3dba52e42c098d70c54e779183c) - URL: https://github.com/kamailio/kamailio/commit/43cf46c246c830e89c2de9fb6e50689… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:29:37+01:00 tm: backup xavps before running callbacks regular avps were being backupped, just not xavps. (cherry picked from commit e1f96b11379abd60fd53c49a376f6cf3cb1fc69d) (cherry picked from commit 2d311c5897f68362f3bde53a3bbe21316d7c769f) - URL: https://github.com/kamailio/kamailio/commit/79d4bfdc5fe85c02b5f2c620c68837c… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:29:52+01:00 dispatcher: Ignore IPv6 addresses if IPv6 lookups are disabled. (cherry picked from commit 2d7f748ef690846365e4dd5bc5a91df21e39321c) (cherry picked from commit 51b7e8f539ada81cdb8e7fe49d5c0ccf5e3cc274) - URL: https://github.com/kamailio/kamailio/commit/d6f1f583409dc71ac3b0ea3572ef830… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:30:11+01:00 core: Don't log errors when dns find no more records If the proxy is listeneing on both ipv4 and ipv6, DNS attempts are done for both A and AAAA records. If the last of these lookup fails with no records found, don't log an error if the first lookup did already return records. (cherry picked from commit 3aec75e97b579cc67340c0fb81b276321b4ab73a) (cherry picked from commit d14ba3700928a16b500cf832c1101d2fdd12a0e2) - URL: https://github.com/kamailio/kamailio/commit/15bbb0963320ccc26e46443815048a9… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:30:33+01:00 perl: check for and handle memory allocation failures (cherry picked from commit 293caa403bba6741d15254a42d106392fc657888) (cherry picked from commit c161bd375b2e00215fa3d657aa6ec273ce515e6c) - URL: https://github.com/kamailio/kamailio/commit/432919572488b39105d04cfc7a0247f… Author: Alex Hermann <alex(a)speakup.nl> Date: 2015-01-15T20:31:21+01:00 perl: Sync log levels with kamailio core (cherry picked from commit 92fa1ac28b4991cd83338d1f99e898dfe1d8742f) (cherry picked from commit 2965000599c1b03ad9b90eb6c773d03953b6e603) - URL: https://github.com/kamailio/kamailio/commit/deb53770a5e4725f3da59d3ab36315b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:31:39+01:00 pua_reginfo: avoid sending notify when processing location record action triggered by itself (cherry picked from commit e070257321853d799a6325ac5e94f69b4ccb85e7) (cherry picked from commit 39d6a77084f6c32af1f0de646410a247e55355c3) - URL: https://github.com/kamailio/kamailio/commit/b7a33afcc23ab123736a236b9b21266… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:32:18+01:00 htable: use mode everywhere to control the locks for add operation (cherry picked from commit c7ff8a88e773e8d25958f86d178f05ee10fd0410) (cherry picked from commit 4bd289f1d893fd36c4fe508f34c0d2a58901d119) - URL: https://github.com/kamailio/kamailio/commit/cfe96f969515554daf1ebb9299444a4… Author: Juha Heinanen <jh(a)tutpro.com> Date: 2015-01-15T20:36:16+01:00 modules/pua: do not override send_publish return value at error (cherry picked from commit 0ac4c8e579214a75b102f2f1c6877dffb2db8597) - URL: https://github.com/kamailio/kamailio/commit/df9e8241112e3eef5a65238950061fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:39:11+01:00 registrar: don't free r-uri branch attributes in lookup_branches() - just clear the values in sip_msg_t structure so the pointers can be reused and avoid double free - reported by Anthony Messina (cherry picked from commit 9a46223c077c8d058cdc633563b0d9f14af332ae) (cherry picked from commit 82a60e0c7a7e33908bae52d11fe4911df91823c2) - URL: https://github.com/kamailio/kamailio/commit/c72fc424115cdcac107418c68450c59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:40:50+01:00 siputils: fix for e164_check() - the condition for non-digit matching was always false (cherry picked from commit fbcfa198a2c89868fa021f6a63774425e480b27b) (cherry picked from commit 2d1032b3c8a1184357615b37da99dfd76526afa7) - URL: https://github.com/kamailio/kamailio/commit/74e5c239b4a5df0fa1c1de9af9df3ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:41:20+01:00 auth_db: fixed is_subscriber() when load_credentials is not set - the flag parameter can be also explicit on skipping the credentials (cherry picked from commit d948ca564b4f669905485e040e295f54bd3f36a2) (cherry picked from commit 0b0b47277becda0926db0e60b6119a2621c28891) - URL: https://github.com/kamailio/kamailio/commit/5b5044c74704dde359a009250038e7a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:42:29+01:00 nat_traversal: use local variable for port and proto on keepalive resolve - safe execution for those resolving functions expecting PROTO_NONE - reported by Jason Penton, FS#491 (cherry picked from commit 0bbcbe8328d558a9bf3cb151ab53be93b09c2669) (cherry picked from commit b97ee8732103edc6391c2625ea38c448c371054a) - URL: https://github.com/kamailio/kamailio/commit/f38a1c6e636f13e68d3300aeced3089… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:42:40+01:00 core: safety checks on proto variable for dsn resolving - avoid crashes if functions used inadequately with a null pointer (cherry picked from commit aff1dcd3dc63c0fe124fc138d553da0723c615a8) (cherry picked from commit 813b25663adbaae1c4f5ea2731c1fe16cad756e2) - URL: https://github.com/kamailio/kamailio/commit/969d3f185b905e1b58d9c79d2bac399… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:42:54+01:00 siptrace: use the method from cseq header for tm replies - the hook in transaction structure is invalid for cancel replies, because the transaction structure is built for invite - reported by Klaus Darilion, FS#489 (cherry picked from commit 88173da2b684a3a3f86ee01ac5de401f492ff240) (cherry picked from commit 0702109631ac1cd56a5ce575c1674dc41db1a4de) - URL: https://github.com/kamailio/kamailio/commit/390a7afbb051bd51f0c2207b862046f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:43:10+01:00 tm: downgraded err to warn when sending out for a branch fails - can happen if tcp connection is not active and no connect is set, FS#68 (cherry picked from commit c10c13b2582fd667d24e691219939e224cffaf30) (cherry picked from commit 8dfcf311562861dcf36c19be80ad1594169b57b1) - URL: https://github.com/kamailio/kamailio/commit/b5dcd76df30811c8bd2f38efc8f8a6b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:44:07+01:00 db_mysql: fixing include in Makefile for many paths - sed matching should break at whitespace, to fix the case when mysql_config returns multiple include paths - reported by FS#503 (cherry picked from commit 487d4160b99a1a5ea48751d2f7404cb08e1f4546) (cherry picked from commit a8ac25dc14e4bfb744159148bb7edcdb6f77b58a) - URL: https://github.com/kamailio/kamailio/commit/357e038ad5322cceff6764bf44d3403… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:45:35+01:00 utils/protoshoot: fixed name and ticks - version to 0.4 (cherry picked from commit 72a616f074f554dfb177ca8ec2b55f9ff11ad352) (cherry picked from commit 0a9d23605b50bef00f516255e3bc2d1ab75f0494) - URL: https://github.com/kamailio/kamailio/commit/c5c351c1eec326cc278b75e94e66df8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:46:03+01:00 pipelimit: take in consideration number of cpus for load - on multi core systems, the sums of stats can go over 100%, resulting in out of range for expected load_value to be 0.0 to 1.0 - safety checks to avoid overflows - reported by Luca M. (cherry picked from commit d9e87383613d4d24efe3d1eb144ad6c9cc30b2b0) (cherry picked from commit 4b435cb33c86844e6f8339090f445ab062a24f28) - URL: https://github.com/kamailio/kamailio/commit/4cc6875796e2335fa5e8666bbc85ddf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:46:13+01:00 ratelimite: take in consideration number of cpus for load - on multi core systems, the sums of stats can go over 100%, resulting in out of range for expected load_value to be 0.0 to 1.0 - safety checks to avoid overflows (cherry picked from commit b22c63a930a3c8d4055ddeea48bb29b7fb3b2eb1) (cherry picked from commit 3fb17ae591fcdfb0b1127f6f9547fe2c7f4c4619) - URL: https://github.com/kamailio/kamailio/commit/7c10bf0c4bde5c0fbc488748d8eb2a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:46:50+01:00 core: preprocessor subst rules are applied to pv names - all name is matched and substituted before pv is looked up - reported in FS#139 (cherry picked from commit 39ffe589035fce17145023204b1005702e02a66f) (cherry picked from commit 4fb321cb441e38ca5b0fc65904cddf4f65f0bb53) - URL: https://github.com/kamailio/kamailio/commit/66534a4be5b8108663f8d9f889d4c9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:47:09+01:00 tm: safety check for CRLF at end of custom headers for local requests - if hdrs value is not ending in '\n', add '\r\n' (cherry picked from commit b60b337e04f41d4b5262cb068f1bef6f827dba27) (cherry picked from commit c3ce62ca27ddd348635f048ec9e7840a5a7f4c48) - URL: https://github.com/kamailio/kamailio/commit/d3d66b1087b34676be30811c61e52fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:47:41+01:00 dialog: proper handling of dlg_set_timeout() for not confirmed dialogs (cherry picked from commit a41eab6bedf670f9f34f069b82a85c3a49c5e1bd) (cherry picked from commit a01849a60533e3b60dab71f1a3a632ae4b84f831) - URL: https://github.com/kamailio/kamailio/commit/cd7e96c1be68f27ddeb5c55435a72c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:48:10+01:00 pipelimit: _SC_NPROCESSORS_ONLN is available on FreeBSD - used for getting number of cpus - reported on GH#24 (cherry picked from commit cf65a6ad41396bf5e67d23e12720c420688d7880) (cherry picked from commit a711f12d5f4b48b3ccf385492d4c93ace7db515c) - URL: https://github.com/kamailio/kamailio/commit/5374aeff7beae14a88a403514d67a7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:48:20+01:00 ratelimit: _SC_NPROCESSORS_ONLN is available on FreeBSD - used for getting number of cpus - reported on GH#24 (cherry picked from commit 7886ddc516f5a4cef1d3730306a2a2ded06d4986) (cherry picked from commit f0159a194a8ac0c0f5599867764d447ef2b5bf45) - URL: https://github.com/kamailio/kamailio/commit/8ab37e559518acf06ab30eabdd5d82f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:48:56+01:00 jsonrpc-c: fixed typo in header guard (cherry picked from commit 8f86d2f16af57dc26229f721c9cb86b7f68208cd) (cherry picked from commit d374e4b2b92dab4127df9a98ae9b374928f03a28) - URL: https://github.com/kamailio/kamailio/commit/4c1ce655afe85c8e341f71e579de64b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:49:13+01:00 docbook/Makefile: use default system catalog implicitely - custom catalog can be forced with nocatalog=no (cherry picked from commit 508b11011c85bb21e5bd4212a16fabb9136e22fa) (cherry picked from commit 9e293335585598e6f7bf7c9e58a0bee4cc9eb068) - URL: https://github.com/kamailio/kamailio/commit/799b61f53a711f6dd79b5e18e29828e… Author: Walter Doekes <walter+github(a)wjd.nu> Date: 2015-01-15T20:49:24+01:00 websocket: Check frame->wsc in ws_frame_transmit for NULL. Add frame.wsc == NULL check in ws_frame_transmit similar to the checks in ws_close and friends and ws_frame_receive to avoid crashing if the tcp connection was been terminated prematurely. (cherry picked from commit c109755d347500d8dcfa92a75cb11c9cea2727c2) (cherry picked from commit b41d779b6d8b30f311a490d76f211c1ca656ce38) - URL: https://github.com/kamailio/kamailio/commit/8c6a2a9d06af6176fafe90fe4e9e205… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2015-01-15T20:49:40+01:00 siputils: fix for e164_check() - the condition for non-digit matching was always false (cherry picked from commit 160710af0ab85dbf211fa7d445d6d4be9b66db10) (cherry picked from commit a56b51de8d6c10e06146fbf65ae7d46793e288c9) - URL: https://github.com/kamailio/kamailio/commit/a1f047fbacf64ae540726c1fef1bedb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:50:00+01:00 core: parse_add_spec() free params in case of parsing failure (cherry picked from commit 5a71429596851d8096de1abe5542e57e8b8f6547) (cherry picked from commit b7657fde6c74673060e1d59e604c1b72ca284dbf) - URL: https://github.com/kamailio/kamailio/commit/e4d9b6e08e88fc487cfe408ff43caf7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:50:10+01:00 core: parse_ppi_pai - free header parameters for PAI and PPI - they are not considere in the compacted p_id_body_t and not freed - specs don't mention headers parameters for PAI and PPI, but could come as UA extensions (cherry picked from commit c1b4d442501591bd18e8130474eeb5c16101e549) (cherry picked from commit 38d6c0bc62b12ecb8402d165a21813c533c55324) - URL: https://github.com/kamailio/kamailio/commit/1ba3ac33da3be5cb677a1280b1d7916… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:50:20+01:00 core: remove_lump() clears its innner before/after lists - fixing leak issues that could be created by using sl_forward_reply() in config file (cherry picked from commit 1fd0ca99eaa4b2c5cfcb8bd555a35088ddf49343) (cherry picked from commit 74888e44aa4db53a3e8db49d848af97d460f7e1f) - URL: https://github.com/kamailio/kamailio/commit/fceba94bace3457546089c3ebf58b60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:50:33+01:00 sl: don't remove the lump added in the 'after' list of delete lump - they are destroyed together, making the operation useless (cherry picked from commit 338b00c0f2d38694cffe3536e7eeed0e0d5372dd) (cherry picked from commit 6b7bbc8e58eae9b43b47efb270c20bb3d93ec2f0) - URL: https://github.com/kamailio/kamailio/commit/89a53d3710cc1b672897161bd4a118b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:50:55+01:00 presence: fix counter and type for removing presentity from cache - report and patch by Kristian F. HÃ¸gh (cherry picked from commit d43e8965640bbc64e56ef33f27d4f3c3a85c73fa) (cherry picked from commit 32e85b6481b31a1f4aa46603849cb02433e50915)

9 years, 10 months

git:4.2:32e85b64: presence: fix counter and type for removing presentity from cache

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 32e85b6481b31a1f4aa46603849cb02433e50915 URL: https://github.com/kamailio/kamailio/commit/32e85b6481b31a1f4aa46603849cb02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:15:06+01:00 presence: fix counter and type for removing presentity from cache - report and patch by Kristian F. HÃ¸gh (cherry picked from commit d43e8965640bbc64e56ef33f27d4f3c3a85c73fa) --- Modified: modules/presence/event_list.h Modified: modules/presence/hash.c Modified: modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/32e85b6481b31a1f4aa46603849cb02… Patch: https://github.com/kamailio/kamailio/commit/32e85b6481b31a1f4aa46603849cb02… --- diff --git a/modules/presence/event_list.h b/modules/presence/event_list.h index 2ebcafc..29511cb 100644 --- a/modules/presence/event_list.h +++ b/modules/presence/event_list.h @@ -83,7 +83,7 @@ struct pres_ev event_t* evp; str content_type; int default_expires; - int type; + int type; /* category type: WINFO_TIPE, PUBL_TYPE, ...*/ int etag_not_new; /* * 0 - the standard mechanism (allocating new etag for each Publish) diff --git a/modules/presence/hash.c b/modules/presence/hash.c index 4c6f181..08a3461 100644 --- a/modules/presence/hash.c +++ b/modules/presence/hash.c @@ -512,14 +512,16 @@ int insert_phtable(str* pres_uri, int event, char* sphere) if(p->sphere== NULL) { lock_release(&pres_htable[hash_code].lock); + shm_free(p); ERR_MEM(SHARE_MEM); } strcpy(p->sphere, sphere); } p->event= event; - + p->publ_count=1; + /* link the item in the hash table */ p->next= pres_htable[hash_code].entries->next; pres_htable[hash_code].entries->next= p; diff --git a/modules/presence/publish.c b/modules/presence/publish.c index 46ec334..4ca9afb 100644 --- a/modules/presence/publish.c +++ b/modules/presence/publish.c @@ -134,7 +134,7 @@ void msg_presentity_clean(unsigned int ticks,void *param) event.s = (char *) VAL_STRING(&values[event_col]); event.len = strlen(event.s); pres.event= contains_event(&event, NULL); - if(pres.event== NULL) + if(pres.event==NULL || pres.event->evp==NULL) { LM_ERR("event not found\n"); goto error; @@ -147,7 +147,7 @@ void msg_presentity_clean(unsigned int ticks,void *param) } /* delete from hash table */ - if(publ_cache_enabled && delete_phtable(&uri, pres.event->type)< 0) + if(publ_cache_enabled && delete_phtable(&uri, pres.event->evp->type)< 0) { LM_ERR("deleting from pres hash table\n"); goto error;

9 years, 10 months

git:4.2:6b7bbc8e: sl: don't remove the lump added in the 'after' list of delete lump

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 6b7bbc8e58eae9b43b47efb270c20bb3d93ec2f0 URL: https://github.com/kamailio/kamailio/commit/6b7bbc8e58eae9b43b47efb270c20bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:14:53+01:00 sl: don't remove the lump added in the 'after' list of delete lump - they are destroyed together, making the operation useless (cherry picked from commit 338b00c0f2d38694cffe3536e7eeed0e0d5372dd) --- Modified: modules/sl/sl.c --- Diff: https://github.com/kamailio/kamailio/commit/6b7bbc8e58eae9b43b47efb270c20bb… Patch: https://github.com/kamailio/kamailio/commit/6b7bbc8e58eae9b43b47efb270c20bb… --- diff --git a/modules/sl/sl.c b/modules/sl/sl.c index 3a8cea2..5f3febb 100644 --- a/modules/sl/sl.c +++ b/modules/sl/sl.c @@ -437,9 +437,8 @@ static int w_sl_forward_reply(sip_msg_t* msg, str* code, str* reason) if(reason!=NULL) { if(ldel!=NULL) { remove_lump(msg, ldel); - } - if(ladd!=NULL) { - remove_lump(msg, ladd); + /* ladd is liked in the 'after' list inside ldel, + * destroyed together, no need for its own remove operation */ } } if(code!=NULL) {

9 years, 10 months

git:4.2:38d6c0bc: core: parse_ppi_pai - free header parameters for PAI and PPI

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 38d6c0bc62b12ecb8402d165a21813c533c55324 URL: https://github.com/kamailio/kamailio/commit/38d6c0bc62b12ecb8402d165a21813c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:14:29+01:00 core: parse_ppi_pai - free header parameters for PAI and PPI - they are not considere in the compacted p_id_body_t and not freed - specs don't mention headers parameters for PAI and PPI, but could come as UA extensions (cherry picked from commit c1b4d442501591bd18e8130474eeb5c16101e549) --- Modified: parser/parse_ppi_pai.c --- Diff: https://github.com/kamailio/kamailio/commit/38d6c0bc62b12ecb8402d165a21813c… Patch: https://github.com/kamailio/kamailio/commit/38d6c0bc62b12ecb8402d165a21813c… --- diff --git a/parser/parse_ppi_pai.c b/parser/parse_ppi_pai.c index db50dc9..a82b50e 100644 --- a/parser/parse_ppi_pai.c +++ b/parser/parse_ppi_pai.c @@ -62,6 +62,8 @@ int parse_pai_ppi_body(char *buf, int len, p_id_body_t **body) LM_ERR("Error parsing PAI/PPI body %u '%.*s'\n", num_uri, len, buf); return -1; } + /* should be no header params, but in case there are, free them */ + free_to_params(&uri_b[num_uri]); num_uri++; while ((*tmp == ',') && (num_uri < NUM_PAI_BODIES)) { @@ -72,6 +74,8 @@ int parse_pai_ppi_body(char *buf, int len, p_id_body_t **body) LM_ERR("Error parsing PAI/PPI body %u '%.*s'\n", num_uri, len, buf); return -1; } + /* should be no header params, but in case there are, free them */ + free_to_params(&uri_b[num_uri]); num_uri++; } if (num_uri >= NUM_PAI_BODIES)

9 years, 10 months

git:4.2:74888e44: core: remove_lump() clears its innner before/after lists

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: 74888e44aa4db53a3e8db49d848af97d460f7e1f URL: https://github.com/kamailio/kamailio/commit/74888e44aa4db53a3e8db49d848af97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:14:41+01:00 core: remove_lump() clears its innner before/after lists - fixing leak issues that could be created by using sl_forward_reply() in config file (cherry picked from commit 1fd0ca99eaa4b2c5cfcb8bd555a35088ddf49343) --- Modified: data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/74888e44aa4db53a3e8db49d848af97… Patch: https://github.com/kamailio/kamailio/commit/74888e44aa4db53a3e8db49d848af97… --- diff --git a/data_lump.c b/data_lump.c index 5faee6f..6beb93f 100644 --- a/data_lump.c +++ b/data_lump.c @@ -709,6 +709,11 @@ unsigned int count_applied_lumps(struct lump *ll, int type) return n; } +/** + * remove a lump in a root list + * - it doesn't look for lumps added as before/after rule + * - destroys the entire lump, with associated before/after rules + */ int remove_lump(sip_msg_t *msg, struct lump *l) { struct lump *t = NULL; @@ -733,7 +738,9 @@ int remove_lump(sip_msg_t *msg, struct lump *l) } else { prev->next = t->next; } - free_lump(t); + /* detach and free all its content */ + t->next = NULL; + free_lump_list(t); return 1; } return 0;

9 years, 10 months

git:4.2:b7657fde: core: parse_add_spec() free params in case of parsing failure

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: b7657fde6c74673060e1d59e604c1b72ca284dbf URL: https://github.com/kamailio/kamailio/commit/b7657fde6c74673060e1d59e604c1b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:14:20+01:00 core: parse_add_spec() free params in case of parsing failure (cherry picked from commit 5a71429596851d8096de1abe5542e57e8b8f6547) --- Modified: parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/b7657fde6c74673060e1d59e604c1b7… Patch: https://github.com/kamailio/kamailio/commit/b7657fde6c74673060e1d59e604c1b7… --- diff --git a/parser/parse_addr_spec.c b/parser/parse_addr_spec.c index f0388a2..c943bf9 100644 --- a/parser/parse_addr_spec.c +++ b/parser/parse_addr_spec.c @@ -913,6 +913,7 @@ char* parse_addr_spec(char* const buffer, const char* const end, struct to_body* return tmp; error: + free_to_params(to_b); to_b->error=PARSE_ERROR; return tmp;

9 years, 10 months

git:4.2:a56b51de: siputils: fix for e164_check()

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: a56b51de8d6c10e06146fbf65ae7d46793e288c9 URL: https://github.com/kamailio/kamailio/commit/a56b51de8d6c10e06146fbf65ae7d46… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:13:44+01:00 siputils: fix for e164_check() - the condition for non-digit matching was always false (cherry picked from commit 160710af0ab85dbf211fa7d445d6d4be9b66db10) --- Modified: modules/siputils/checks.c --- Diff: https://github.com/kamailio/kamailio/commit/a56b51de8d6c10e06146fbf65ae7d46… Patch: https://github.com/kamailio/kamailio/commit/a56b51de8d6c10e06146fbf65ae7d46… --- diff --git a/modules/siputils/checks.c b/modules/siputils/checks.c index 0399747..f265c38 100644 --- a/modules/siputils/checks.c +++ b/modules/siputils/checks.c @@ -423,7 +423,7 @@ static inline int e164_check(str* _user) char c; if ((_user->len > 2) && (_user->len < 17) && ((_user->s)[0] == '+')) { - for (i = 1; i <= _user->len; i++) { + for (i = 1; i < _user->len; i++) { c = (_user->s)[i]; if (c < '0' || c > '9') return -1; }

9 years, 10 months

git:4.2:b41d779b: websocket: Check frame->wsc in ws_frame_transmit for NULL.

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.2 Commit: b41d779b6d8b30f311a490d76f211c1ca656ce38 URL: https://github.com/kamailio/kamailio/commit/b41d779b6d8b30f311a490d76f211c1… Author: Walter Doekes <walter+github(a)wjd.nu> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-15T20:13:01+01:00 websocket: Check frame->wsc in ws_frame_transmit for NULL. Add frame.wsc == NULL check in ws_frame_transmit similar to the checks in ws_close and friends and ws_frame_receive to avoid crashing if the tcp connection was been terminated prematurely. (cherry picked from commit c109755d347500d8dcfa92a75cb11c9cea2727c2) --- Modified: modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/b41d779b6d8b30f311a490d76f211c1… Patch: https://github.com/kamailio/kamailio/commit/b41d779b6d8b30f311a490d76f211c1… --- diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index d3814bd..a6b4f90 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -743,6 +743,11 @@ int ws_frame_transmit(void *data) frame.payload_len = wsev->len; frame.payload_data = wsev->buf; frame.wsc = wsconn_get(wsev->id); + if (frame.wsc == NULL) + { + LM_ERR("WebSocket outbound connection not found\n"); + return -1; + } LM_DBG("Tx message:\n%.*s\n", frame.payload_len, frame.payload_data);

9 years, 10 months

← Newer
1
...
18
19
20
21
22
23
24
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015