Commit Graph

120 Commits

Author SHA1 Message Date
Kevin P. Fleming bd4eb070f3 bring over all the fixes for the warnings found by gcc 4.3.x from the 1.4 branch, and add the ones needed for all the new code here too
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@153616 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-11-02 18:52:13 +00:00
Tilghman Lesher 08af5bb312 Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating
when a file is invalid from when a file is missing.  This is most important when
we have two configuration files.  Consider the following example:

Old system:
sip.conf     users.conf     Old result               New result
========     ==========     ==========               ==========
Missing      Missing        SIP doesn't load         SIP doesn't load
Missing      OK             SIP doesn't load         SIP doesn't load
Missing      Invalid        SIP doesn't load         SIP doesn't load
OK           Missing        SIP loads                SIP loads
OK           OK             SIP loads                SIP loads
OK           Invalid        SIP loads incompletely   SIP doesn't load
Invalid      Missing        SIP doesn't load         SIP doesn't load
Invalid      OK             SIP doesn't load         SIP doesn't load
Invalid      Invalid        SIP doesn't load         SIP doesn't load

So in the case when users.conf doesn't load because there's a typo that
disrupts the syntax, we may only partially load users, instead of failing with
an error, which may cause some calls not to get processed.  Worse yet, the old
system would do this with no indication that anything was even wrong.

(closes issue #10690)
 Reported by: dtyoo
 Patches: 
       20080716__bug10690.diff.txt uploaded by Corydon76 (license 14)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 23:30:03 +00:00
Philippe Sultan 7ea67a07ee Disable autoprune by default.
(closes issue #13411)
Reported by: caio1982
Patches:
      res_jabber_autoprune1.diff uploaded by caio1982 (license 22)
Tested by: caio1982

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142280 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-09 22:08:56 +00:00
Philippe Sultan 4d9a38bc3f Mention JID rather than SreenName in help messages
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-19 15:58:39 +00:00
Olle Johansson a4436cb2ff - Formatting
- Changing debug messages from VERBOSE to DEBUG channel
- Adding a few todo's
- Adding a few more "XMPP"'s to compliment Jabber...



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136005 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-06 13:34:08 +00:00
Philippe Sultan e08829764c Fix a compile time error that occurs if OpenSSL is not installed. Reported by Noel Morais on the users mailing list
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@125703 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-27 07:28:17 +00:00
Philippe Sultan 6be95a8a8a Subscribe to buddy's presence only if we really need to. That is, if
the corresponding roster item has a subscription value set to "none"
or "from".

Make the code more readable.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@124872 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-24 17:50:22 +00:00
Philippe Sultan c8688bd9b2 Code simplification
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@124870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-24 17:28:39 +00:00
Philippe Sultan 6bb4c9cde0 Merged revisions 120675 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r120675 | phsultan | 2008-06-05 18:56:15 +0200 (Thu, 05 Jun 2008) | 2 lines

Ignore appended resource when comparing JIDs.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@120676 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-05 17:02:39 +00:00
Philippe Sultan 001c95b595 Do not link the guest account with any configured XMPP client (in
jabber.conf). The actual connection is made when a call comes in
Asterisk.

Apply this fix to Jingle too.

Fix the ast_aji_get_client function that was not able to retrieve an
XMPP client from its JID.

(closes issue #12085)
Reported by: junky
Tested by: phsultan


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@119741 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-06-02 14:35:24 +00:00
Philippe Sultan de98d48a0d - remove whitespaces between tags in received XML packets before giving
them to the parser ;
- report Gtalk error messages from a buddy to the console.

This patch makes Asterisk "Google Jingle" (chan_gtalk) implementation
work with Empathy. Note that this is only true for audio streams, not
video.

Thank you to PH for his great help!

(closes issue #12647)
Reported by: PH
Patches:
      trunk-12647-1.diff uploaded by phsultan (license 73)
Tested by: phsultan, PH

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@118020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-05-23 10:33:21 +00:00
Philippe Sultan 60a9d14d56 Merged revisions 114198 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114198 | phsultan | 2008-04-17 15:42:23 +0200 (Thu, 17 Apr 2008) | 2 lines

Use keepalives effectively in order diagnose bug #12432.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114199 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-04-17 13:46:17 +00:00
Philippe Sultan 6ef8831aab Merged revisions 105326 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r105326 | phsultan | 2008-02-29 15:47:10 +0100 (Fri, 29 Feb 2008) | 1 line

Fix a potential memory leak
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-29 14:50:40 +00:00
Philippe Sultan 7293986e44 Remove unnecessary if statements before calling iks_delete (redundant check is
done inside iks_delete), thus making the code conform with coding guidelines.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105263 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-29 14:15:03 +00:00
Philippe Sultan 265f5cd62c Automatically create new buddy upon reception of a presence stanza of
type subscribed.

(closes issue #12066)
Reported by: ffadaie
Patches:
      branch-1.4-12066-1.diff uploaded by phsultan (license 73)
      trunk-12066-1.diff uploaded by phsultan (license 73)
Tested by: ffadaie, phsultan

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-29 13:12:34 +00:00
Philippe Sultan f98f90af49 Use an ast_flags structure in aji_client and aji_buddy rather than an
integer. Modify calls to various ast_*_flag macros accordingly.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103341 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-12 14:08:58 +00:00
Russell Bryant 1ec8cb41a8 Merge changes from team/mvanbaak/cli-command-audit
(closes issue #8925)

About a year ago, as Leif Madsen and Jim van Meggelen were going over the CLI
commands in Asterisk 1.4 for the next version of their book, they documented
a lot of inconsistencies.  This set of changes addresses all of these issues
and has been reviewed by Leif.

While this does introduce even more changes to the CLI command structure, it
makes everything consistent, which is the most important thing.

Thanks to all that helped with this one!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103171 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-08 21:26:32 +00:00
Mark Michelson fe9821cc10 Get rid of any remaining ast_verbose calls in the code in favor of
ast_verb

(closes issue #11934)
Reported by: mvanbaak
Patches:
      20080205_astverb-2.diff.txt uploaded by mvanbaak (license 7)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@102525 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-02-05 23:00:15 +00:00
Olle Johansson 67439d7f0d Iksemel is alive in a new home. Release 1.3 is out with bug fixes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97199 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-08 20:58:56 +00:00
Philippe Sultan cc00602238 Use SASL DIGEST-MD5 authentication over unsecured network connections only.
This authentication mechanism is implemented under the iksemel API, which
makes use of GnuTLS, whereas we use OpenSSL. Note : there's ongoing
dicsussion at the SASL IETF WG in order to deprecate SASL DIGEST-MD5, see
http://ietfreport.isoc.org/ids-wg-sasl.html.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@96499 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-04 17:19:25 +00:00
Philippe Sultan c08a968cb4 Set stream flags to zero upon initialization.
When the XMPP over TLS/SSL connection resets for some reason, it is
wrongly believed as being secured, which makes the re-connection
process endlessly fail. This was reported by mvanbaak in issue #11644.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@95794 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-01-02 11:34:26 +00:00
Olle Johansson 5ac0f923b3 A few more "moremanager" fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-27 21:10:50 +00:00
Luigi Rizzo e0ff5fef5c remove a bunch of useless #include "options.h"
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89511 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-21 23:09:02 +00:00
Luigi Rizzo 0595b5e2aa include "logger.h" and errno.h from asterisk.h - usage shows that they
were included almost everywhere.
Remove some of the instances.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89424 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-19 18:52:04 +00:00
Luigi Rizzo fdb7f7ba3d Start untangling header inclusion in a way that does not affect
build times - tested, there is no measureable difference before and
after this commit.

In this change:

use asterisk/compat.h to include a small set of system headers:
inttypes.h, unistd.h, stddef.h, stddint.h, sys/types.h, stdarg.h,
stdlib.h, alloca.h, stdio.h

Where available, the inclusion is conditional on HAVE_FOO_H as determined
by autoconf.

Normally, source files should not include any of the above system headers,
and instead use either "asterisk.h" or "asterisk/compat.h" which does it
better. 

For the time being I have left alone second-level directories
(main/db1-ast, etc.).



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89333 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-16 20:04:58 +00:00
Tilghman Lesher 0f6892419e One more typo in config.c; and missed conversions due to the constifying of ast_variable_new parameters
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-14 15:13:22 +00:00
Kevin P. Fleming edc78d6023 improve linked-list macros in two ways:
- the *_CURRENT macros no longer need the list head pointer argument
  - add AST_LIST_MOVE_CURRENT to encapsulate the remove/add operation when moving entries between lists


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-08 05:28:47 +00:00
Steve Murphy a87efea3c4 Merged revisions 89088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r89088 | murf | 2007-11-07 14:40:28 -0700 (Wed, 07 Nov 2007) | 1 line

In response to 10578, I just ran 1.4 thru valgrind; some of the config leakage I've already fixed, but it doesn't hurt to double check. I found and fixed leaks in res_jabber, cdr_tds, pbx_ael. Nothing major, tho.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89089 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-07 22:09:10 +00:00
Jason Parker 2c582c7cfb Allow gtalk and jingle to use TLS connections again.
Closes issue #9972


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-06 18:44:19 +00:00
Jason Parker 5a58a4c475 Switch res_jabber to use openssl rather than gnutls.
Closes issue #9972, patch by phsultan.  Copied from branch at http://svn.digium.com/svn/asterisk/team/phsultan/res_jabber-openssl/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88164 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-11-01 22:10:33 +00:00
Jason Parker b1d5789cc5 Merged revisions 87908 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11131)
........
r87908 | qwell | 2007-10-31 16:23:11 -0500 (Wed, 31 Oct 2007) | 4 lines

Make sure we free some allocated memory before returning.

Issue 11131, patch by eliel.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-31 21:23:42 +00:00
Jason Parker ebe4050128 Switch from AST_CLI (formerly NEW_CLI) to AST_CLI_DEFINE, since the former didn't make much sense
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-22 20:05:18 +00:00
Jason Parker b0f3e6097e Convert NEW_CLI to AST_CLI.
Closes issue #11039, as suggested by seanbright.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-19 18:29:40 +00:00
Philippe Sultan ad83510903 Allocate more space for the base64 output we need to generate.
Closes issue #10913, reported by tootai, who graciously granted us access
to his Asterisk server, thanks! Daniel, feel free to reopen the bug in
case you can reproduce this on 1.4.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85551 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-15 13:51:21 +00:00
Philippe Sultan 510430a6a2 Make the status and priority configurable.
Closes issue #10785, patch by Luke-Jr, thanks!

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-07 16:28:25 +00:00
Philippe Sultan fb54978cca Merged revisions 84902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84902 | phsultan | 2007-10-07 18:15:39 +0200 (Sun, 07 Oct 2007) | 5 lines

Presence packets from a client who's connected with our Jabber ID are
valid, therefore, those clients must be considered as buddies. The resource
string helps us make the distinction between clients.

Closes issue #10707, reported by yusufmotiwala.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-07 16:18:49 +00:00
Philippe Sultan c9ba43a904 Fix indentation
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-07 15:56:22 +00:00
Philippe Sultan 4e75bec027 Merged revisions 84890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84890 | phsultan | 2007-10-07 17:52:44 +0200 (Sun, 07 Oct 2007) | 5 lines

Prevent Asterisk from crashing when receiving a presence packet
without resource from a buddy that is known to have a resource list.

Revert a change I previously made, where Asterisk could point to a
freed memory location.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84891 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-07 15:54:48 +00:00
Tilghman Lesher 10dc88ba02 Update to current coding standards, also changing the argument delimiter to ',' (Closes issue #10876)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-10-04 16:56:00 +00:00
Philippe Sultan a5007c54d7 Added a CLI command that shows our buddy list, as suggested by Daniel McKeehan, thanks!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@83804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-25 16:34:49 +00:00
Jason Parker c7a9ec1691 (issue #10724)
Reported by: eliel
Patches:
      res_features.c.patch uploaded by eliel (license 64)
      res_agi.c.patch uploaded by seanbright (license 71)
      res_musiconhold.c.patch uploaded by seanbright (license 71)
      pbx.c.patch uploaded by moy (license 222)
      logger.c.patch uploaded by moy (license 222)
      frame.c.patch uploaded by moy (license 222)
      manager.c.patch uploaded by moy (license 222)
      http.c.patch uploaded by moy (license 222)
      dnsmgr.c.patch uploaded by moy (license 222)
      res_realtime.c.patch uploaded by eliel (license 64)
      res_odbc.c.patch uploaded by seanbright (license 71)
      res_jabber.c.patch uploaded by eliel (license 64)
      chan_local.c.patch uploaded by eliel (license 64)
      chan_agent.c.patch uploaded by eliel (license 64)
      chan_alsa.c.patch uploaded by eliel (license 64)
      chan_features.c.patch uploaded by eliel (license 64)
      chan_sip.c.patch uploaded by eliel (license 64)
      RollUp.1.patch (includes all of the above patches) uploaded by seanbright (license 71)

Convert many CLI commands to the NEW_CLI format.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82930 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18 22:43:45 +00:00
Philippe Sultan cbbfbb65e8 Merged revisions 81650 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81650 | phsultan | 2007-09-06 16:20:54 +0200 (Thu, 06 Sep 2007) | 3 lines

According to both RFC 3920 - section 9.1.2 - and Google's XMPP server
complaint, if set, the 'from' attribute must be set to the user's full
JID.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81651 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-06 14:24:29 +00:00
Jason Parker d72ea80a00 Doxygen cleanups/fixes.
Closes issue #10654, patch by snuffy


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-05 16:31:39 +00:00
Tilghman Lesher 56b9568164 Don't reload a configuration file if nothing has changed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 21:09:46 +00:00
Philippe Sultan bade686730 Merged revisions 79665 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79665 | phsultan | 2007-08-16 11:37:10 +0200 (Thu, 16 Aug 2007) | 21 lines

A fix for two critical problems detected while working with Daniel
McKeehan in issue #10184. 

Upon priority change, the resource list is not NULL terminated when
moving an item to the end of the list. This makes Asterisk endlessy
loop whenever it needs to read the list. Jids with different resource and
priority values, like in Gmail's and GoogleTalk's jabber clients put
that problem in evidence.

Upon reception of a 'from' attribute with an empty resource string,
Asterisk crashes when trying to access the found->cap pointer if the
resource list for the given buddy is not empty. This situation is
perfectly valid and must be handled. The Gizmoproject's jabber client
put that problem in evidence.

Also added a few comments in the code as well as a handle for the
capabilities from Gmail's jabber client, which are stored in a caps:c tag
rather than the usual c tag.

Closes issue #10184.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-08-16 09:45:22 +00:00
Russell Bryant f8483a0d04 Do a massive conversion for using the ast_verb() macro
(closes issue #10277, patches by mvanbaak)

Basically, this changes ...

if (option_verbose > 2)
   ast_verbose(VERBOSE_PREFIX_3, "Something\n");

to ...

ast_verb(3, "Something\n");


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77299 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-26 15:49:18 +00:00
Jason Parker 685c48b19c Correct an issue where the wrong type was being used to start sasl.
Pointed out by and patch provided by mog.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72987 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-03 02:51:08 +00:00
Jason Parker b1d53e8fc3 Fix building with -Wdeclaration-after-statement
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@72490 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-28 19:30:39 +00:00
Jason Parker e3cf86f4b3 Simplify some code in res_jabber relating to SASL support.
Issue 9988, patch by phsultan.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@71830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-26 16:39:22 +00:00
Russell Bryant 055d82cbce Add a massive set of changes for converting to use the ast_debug() macro.
(issue #9957, patches from mvanbaak, caio1982, critch, and dimas)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-14 19:39:12 +00:00