Commit Graph

99 Commits

Author SHA1 Message Date
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
Russell Bryant
1cd610ddbe Doxygenify a lot of the functions in res_jabber
(issue #9886, snuffy)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-07 21:22:25 +00:00
Russell Bryant
bc0702ba23 Minor formatting change ... testing mantis stuff to see if we're done
(issue #9790)
(closes issue #9816)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-07 15:48:14 +00:00
Olle Johansson
9af51baee7 Merged revisions 68030 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r68030 | oej | 2007-06-07 12:00:17 +0200 (Thu, 07 Jun 2007) | 2 lines

Adding a few Todo's to res_jabber so we don't forget.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-07 10:06:32 +00:00
Olle Johansson
ddb10bf8c7 Merged revisions 68028 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r68028 | oej | 2007-06-07 11:55:13 +0200 (Thu, 07 Jun 2007) | 4 lines

Ok, we found out that this is not about if you have any *active* clients using TLS, but
if you have initialized TLS at all during the lifetime of the module. So if you reload
to disable TLS, it won't help.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-07 10:00:37 +00:00
Olle Johansson
18a9f4d805 Merged revisions 68027 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r68027 | oej | 2007-06-07 11:42:26 +0200 (Thu, 07 Jun 2007) | 8 lines

If you have a jabber client that uses TLS, refuse unload. Bad fix, but will prevent
crashes while we are trying to find a workaround.

Iksemel development seems to have stalled and we might have to stop using the 
TCP/TLS connections in that library and use our own, which would scale better
from a poll/select perspective I guess. It would also make it easier to migrate
to OpenSSL and stop Asterisk from depending on both OpenSSL and GnuTLS.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-07 09:57:52 +00:00
Olle Johansson
bce7e353d6 Merged revisions 67993 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67993 | oej | 2007-06-07 11:00:44 +0200 (Thu, 07 Jun 2007) | 6 lines

Issue #9738 - Make sure we can unload res_jabber. Patch by phsultan - thanks!

Due to a bug in the iksemel library, this will not work if you are using GTLS
in the connection. That's being investigated. If you figure out a way to handle
that without us having to patch iksemel, let us know in the bug report. Thanks.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68026 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-07 09:21:29 +00:00
Olle Johansson
6fc3a29660 Simplification of res_jabber code (done at Inria, Paris with Philippe)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-07 08:45:19 +00:00
Tilghman Lesher
9d05ff8ed5 Issue 9869 - replace malloc and memset with ast_calloc, and other coding guidelines changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-06 21:20:11 +00:00
Tilghman Lesher
4538cec96a Merged revisions 67021 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67021 | tilghman | 2007-06-04 10:50:16 -0500 (Mon, 04 Jun 2007) | 2 lines

Issue 9739 - Malformed jid causes a crash

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-04 15:53:15 +00:00
Olle Johansson
0b2db74e5a Issue #9842 - Doxygen updates by snuffy. Thanks!
(Committed from Media Plaza in Utrecht, Netherlands - Open Source VoIP conference)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-31 10:26:55 +00:00
Kevin P. Fleming
c74518e3ff Merged revisions 66157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66157 | kpfleming | 2007-05-25 10:28:46 -0400 (Fri, 25 May 2007) | 3 lines

handle the GNUTLS library properly in the configure script and build system
don't build in OSP support unless we have found and are allowed to use SSL support

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@66158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-25 14:37:55 +00:00
Olle Johansson
9b95428cce Issue #8409 and accidentally a fix to chan_sip that wasn't supposed to be there
but is still ok... Sorry. Lack of Tea, really.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-24 14:41:43 +00:00
Olle Johansson
a39f95b94f Adding external referenses for doxygen
See http://www.asterisk.org/doxygen/trunk/extref.html


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63230 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-07 18:25:56 +00:00
Jason Parker
cddb061140 Merged revisions 63099 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63099 | qwell | 2007-05-04 15:03:49 -0500 (Fri, 04 May 2007) | 4 lines

Fix a crash when checking version attribute in an incoming XML caps element.

Issue 9667, patch by phsultan.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63104 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-04 20:06:02 +00:00
Olle Johansson
6ec9260e9f Fix JabberEvents
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 18:13:30 +00:00
Olle Johansson
ae6587ac8f Fix missing newline in JabberEvent
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60985 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-09 18:09:31 +00:00
Russell Bryant
921e975d5f Merged revisions 59363 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59363 | russell | 2007-03-29 12:43:52 -0500 (Thu, 29 Mar 2007) | 6 lines

When building a response to a subscription, the "from" must be the full Jabber
ID.  This fixes some problems where jabber users are not able to add their
Asterisk account to their user list, since they are unable to get Asterisk
to approve their subscription.  (issue #8210, reported by caspy, and verified
by bradtem)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-29 17:44:45 +00:00
Joshua Colp
0fb8d82f18 Merged revisions 57770 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57770 | file | 2007-03-04 22:35:03 -0500 (Sun, 04 Mar 2007) | 2 lines

Don't reference a potentially NULL pointer. (issue #9199 reported by klolik)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@57771 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-05 03:39:32 +00:00
Jason Parker
ae47fc4541 Merged revisions 55555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55555 | qwell | 2007-02-20 10:53:45 -0600 (Tue, 20 Feb 2007) | 4 lines

No need to cast nor free with strdupa (thanks file)

55555!

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-20 16:56:58 +00:00
Joshua Colp
264733381a I like it when trunk builds, so let's make res_jabber compile again!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-20 15:19:23 +00:00
Olle Johansson
36c46f0d81 Merged revisions 55483 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55483 | oej | 2007-02-19 22:12:55 +0100 (Mon, 19 Feb 2007) | 3 lines

- Not sending arguments to an application is not "out of memory"
- Making error messages a bit more clear

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-20 07:48:12 +00:00