Commit Graph

24916 Commits

Author SHA1 Message Date
Ken Rice f721a2592b --resolve FS-5566
When you use $12345 in regex substitutions, it isn't obvious
whenever you mean $1-concatenated-2345 or $12-concatenated-345
or any other variation.  In all other languages, in order to
solve this ambiguity, a braces {} are allowed to be used to
separate variable name (or a reference) from surrounding text,
like ${1}2345 or ${12}345.  Use the same for freeswitch too.

While at it, fix a buffer overflow as well: the index[] variable
which is used to copy the "variable" name is 10 chars long, but
it is used in the code without bounds checking, so a reference
which is >9 chars long ($1234567890) will overflow the buffer,
crashing freeswitch.

And another overflow is in the way how size of the "substituted"
variable is handled.  First, in the outer loop, we compare the
wrong variable with the size of `substituted' buffer (amount of
bytes we took from the source instead of amount of bytes we
used in `substituted').  And second, when actual regex match
is being substitured, amount of room in `substituted' variable
is not checked at all.

Patch contributed by Michael Tokarev <mjt@tls.msk.ru>
2013-07-01 17:06:13 -05:00
Anthony Minessale 0548f33a46 fix input event checker pre-empting return value from dtmf checker when both are present 2013-07-01 14:31:57 -05:00
Anthony Minessale 929f52b15c fix race condition on device state destroy 2013-06-28 14:21:18 -05:00
Jeff Lenk 5e2f808de6 FS-5527 fix compiler error windows
(cherry picked from commit a52a604fbb)
2013-06-28 11:10:58 -05:00
Anthony Minessale 74740cca5f FS-5527 --resolve
Conflicts:
	libs/sofia-sip/.update
	libs/sofia-sip/libsofia-sip-ua/nta/nta.c
2013-06-28 10:45:33 -05:00
Chris Rienzo 007ddda560 mod_rayo: dtmf #*A-D was broken 2013-06-28 11:16:40 -04:00
Brian West ba6bf28a5e punt without return 2013-06-28 09:48:28 -05:00
Anthony Minessale fd67c19664 add preAnswer and ringReady too 2013-06-27 16:31:42 -05:00
Anthony Minessale e884116c08 add answer work tag to httapi 2013-06-27 16:26:17 -05:00
Nathan Neulinger 8a3cdc75fc improve skinny behavior in HA deployment 2013-06-26 21:56:54 -05:00
Nathan Neulinger 0e5f90c086 typo 2013-06-26 21:56:48 -05:00
Anthony Minessale ec67542628 set rtp params in skinny for rtp flush on bridge 2013-06-26 18:35:36 -05:00
Anthony Minessale 75e0d9d885 fix empty +flags{} pre-empting conference_member_flags variable 2013-06-26 16:05:00 -05:00
Brian West 182d67ae95 use the correct repeat key to replay messages 2013-06-26 15:17:41 -05:00
Anthony Minessale 594d9f8172 FS-5550 --resolve 2013-06-26 10:51:55 -05:00
Chris Rienzo f536634c04 mod_rayo: added missing modeline 2013-06-25 15:16:53 -04:00
Nathan Neulinger 543dc3caea make noexpandtab explicit in all vim modelines other than xml files
Conflicts:
	src/include/switch_core_media.h
	src/mod/endpoints/mod_sofia/sofia_media.c
	src/switch_core_media.c
2013-06-25 09:39:37 -05:00
Chris Rienzo 30be15fd52 mod_rayo: used wrong stack 2013-06-25 11:40:58 -04:00
Chris Rienzo f434d25b24 mod_rayo: fixes for <prompt> and reply loops 2013-06-25 11:30:39 -04:00
Chris Rienzo 2536706b9b mod_rayo: fix component JID 2013-06-25 08:09:21 -04:00
Chris Rienzo d0ea9d00f8 mod_rayo: fix cleanup of console complete functions 2013-06-25 07:55:19 -04:00
Chris Rienzo 31d0b7bff5 mod_rayo: don't send item-not-found to replies 2013-06-25 07:42:51 -04:00
Chris Rienzo 976083adf6 Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable 2013-06-24 22:27:37 -04:00
Chris Rienzo 4c4841da4b mod_http_cache: valgrind fixes 2013-06-24 22:27:14 -04:00
Chris Rienzo 7a7d1479ed mod_ssml: valgrind fixes 2013-06-24 22:26:58 -04:00
Chris Rienzo 91efe36d4e mod_rayo: valgrind fixes 2013-06-24 22:26:47 -04:00
Chris Rienzo f6d6cd5762 mod_rayo: forgot to return error if unknown destination for stanza 2013-06-24 22:26:34 -04:00
Chris Rienzo 57bdcfb6e9 mod_rayo: added message delivery threads 2013-06-24 22:26:21 -04:00
Chris Rienzo 810c4f5381 mod_rayo: reworked internal messaging- all messages sent by JID only 2013-06-24 22:26:08 -04:00
Chris Rienzo dd2346d2e1 mod_rayo: remove reply from send function - everything is send only now 2013-06-24 22:25:54 -04:00
Anthony Minessale 998ae35dbf FS-5530 --resolve this will make it identical to the bridge behaviour even when the bridge in early media begins and now you will explicitly need continue_on_fail=true in this situation to not fail 2013-06-24 09:46:07 -05:00
Anthony Minessale a0938697df FS-5539 --resolve 2013-06-24 09:15:15 -05:00
Nathan Neulinger 8fd4994b0c skinny more logging improvements and some refactoring of protocol replies 2013-06-23 21:49:15 -05:00
Nathan Neulinger 2060654809 skinny - add simple expansion of text strings by id in the logging msgs 2013-06-23 16:12:13 -05:00
Nathan Neulinger 38ccc48980 logging 2013-06-23 15:18:33 -05:00
Nathan Neulinger 8450dfcaf5 fix broken build due to running with warnings disabled, oops 2013-06-23 15:11:58 -05:00
Nathan Neulinger 71cddf1912 skinny logging 2013-06-23 14:59:58 -05:00
Jeff Lenk 251de9d95d fix windows build 2013-06-23 14:40:51 -05:00
Nathan Neulinger 9679fac195 improvements to skinny logging, table based message text ids 2013-06-23 14:24:29 -05:00
Nathan Neulinger f2fcde49f9 misc constant name adjustments to match actual text on phones 2013-06-22 13:46:50 -05:00
Ben Langfeld 12b293d6aa mod_rayo: Punchblock now supports content-type on input matches
Fix applied to Punchblock here: cef5198e80
2013-06-22 14:29:51 -04:00
Nathan Neulinger 1b55a67083 FS-5532 - workaround to improve behavior, but not correct fix 2013-06-21 14:49:17 -05:00
Chris Rienzo 9829a5cc40 mod_rayo: fix crash when DTMF is received after input timeout 2013-06-21 09:43:38 -04:00
Anthony Minessale 4a4b8690a1 FS-5531 --resolve add another optional param to supply flags for either behaviour n for null and b for boolean 2013-06-20 22:53:20 -05:00
Anthony Minessale 5cb635039d sniffing glue 2013-06-20 22:25:42 -05:00
Anthony Minessale 7656a075c7 fill the opposite file to keep data in sync 2013-06-20 21:51:50 -05:00
Anthony Minessale 8fc477d080 add answer_delay variable to sleep N ms when answer is called from the channel thread 2013-06-20 21:29:50 -05:00
Anthony Minessale b6e3c594c2 FS-5530 2013-06-20 21:16:05 -05:00
Anthony Minessale dfdd2f60d4 FS-5530 --resolve 2013-06-20 21:10:43 -05:00
Anthony Minessale e91b3236a3 FS-5530 --resolve 2013-06-20 20:59:11 -05:00