dect
/
asterisk
Archived
13
0
Fork 0
Commit Graph

119 Commits

Author SHA1 Message Date
lmadsen e73cab2f3f Merged revisions 328247 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328247 | lmadsen | 2011-07-14 16:25:31 -0400 (Thu, 14 Jul 2011) | 14 lines
  
  Merged revisions 328209 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328209 | lmadsen | 2011-07-14 16:13:06 -0400 (Thu, 14 Jul 2011) | 6 lines
    
    Introduce <support_level> tags in MODULEINFO.
    This change introduces MODULEINFO into many modules in Asterisk in order to show
    the community support level for those modules. This is used by changes committed
    to menuselect by Russell Bryant recently (r917 in menuselect). More information about
    the support level types and what they mean is available on the wiki at
    https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@328259 f38db490-d61c-443f-a65b-d21fe96a405b
2011-07-14 20:28:54 +00:00
tilghman 695a84cd48 Merged revisions 320445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r320445 | tilghman | 2011-05-22 18:34:57 -0500 (Sun, 22 May 2011) | 15 lines
  
  Merged revisions 320444 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r320444 | tilghman | 2011-05-22 18:25:51 -0500 (Sun, 22 May 2011) | 8 lines
    
    Don't crash when the connection fails.
    
    (closes issue #19250)
     Reported by: seadweller
     Patches: 
           20110514__issue19250.diff.txt uploaded by tilghman (license 14)
     Tested by: seadweller, sum
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@320446 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-22 23:36:02 +00:00
dvossel c5f4332a6a Merged revisions 316215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316215 | dvossel | 2011-05-03 13:49:48 -0500 (Tue, 03 May 2011) | 9 lines
  
  Fixes a random crash (NULL reference) in res_odbc.c.
  
  (closes issue #19180)
  Reported by: pruiz
  Patches: 
        tmp.diff uploaded by pruiz (license 1152)
  Tested by: pruiz, seanbright
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@316216 f38db490-d61c-443f-a65b-d21fe96a405b
2011-05-03 18:51:41 +00:00
tilghman 1ff4b3b0b3 Merged revisions 307793 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r307793 | tilghman | 2011-02-14 14:16:55 -0600 (Mon, 14 Feb 2011) | 15 lines
  
  Merged revisions 307792 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r307792 | tilghman | 2011-02-14 14:10:28 -0600 (Mon, 14 Feb 2011) | 8 lines
    
    Increment usage count at first reference, to avoid a race condition with many threads creating connections all at once.
    
    (issue #18156)
     Reported by: asgaroth
     Patches: 
           20110214__issue18156.diff.txt uploaded by tilghman (license 14)
     Tested by: tilghman
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@307795 f38db490-d61c-443f-a65b-d21fe96a405b
2011-02-14 20:18:02 +00:00
pabelanger 6705f03406 Replace ast_log(LOG_DEBUG, ...) with ast_debug()
(closes issue #18556)
Reported by: kkm

Review: https://reviewboard.asterisk.org/r/1071/


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@306258 f38db490-d61c-443f-a65b-d21fe96a405b
2011-02-04 16:55:39 +00:00
tilghman ff158f7d4f Merged revisions 300623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300623 | tilghman | 2011-01-05 12:56:12 -0600 (Wed, 05 Jan 2011) | 24 lines
  
  Merged revisions 300622 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r300622 | tilghman | 2011-01-05 12:54:58 -0600 (Wed, 05 Jan 2011) | 17 lines
    
    Merged revisions 300621 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r300621 | tilghman | 2011-01-05 12:47:46 -0600 (Wed, 05 Jan 2011) | 10 lines
      
      Use the sanity check in place of the disconnect/connect cycle.
      
      The disconnect/connect cycle has the potential to cause random crashes.
      
      (closes issue #18243)
       Reported by: ks3
       Patches: 
             res_odbc.patch uploaded by ks3 (license 1147)
       Tested by: ks3
    ........
  ................
................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@300624 f38db490-d61c-443f-a65b-d21fe96a405b
2011-01-05 18:57:05 +00:00
russell 792e106d05 Merged revisions 283659 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283659 | russell | 2010-08-26 08:26:14 -0500 (Thu, 26 Aug 2010) | 2 lines
  
  Slight improvement to a debug message.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@283660 f38db490-d61c-443f-a65b-d21fe96a405b
2010-08-26 13:28:05 +00:00
tilghman 0ae369281a Merged revisions 283561 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283561 | tilghman | 2010-08-25 11:12:43 -0500 (Wed, 25 Aug 2010) | 5 lines
  
  Initialize connect timeout on each time through the loop.
  
  (closes issue #17911)
   Reported by: wurstsalat
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@283562 f38db490-d61c-443f-a65b-d21fe96a405b
2010-08-25 16:14:11 +00:00
tilghman c904b21983 Merged revisions 279113 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r279113 | tilghman | 2010-07-23 13:56:04 -0500 (Fri, 23 Jul 2010) | 2 lines
  
  Silly 64-bit compilers (who uses 64-bit anyway?)
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@279115 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-23 18:56:59 +00:00
tilghman 6bb04df2e6 Merge the realtime failover branch
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278957 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-23 16:19:21 +00:00
tilghman 771cdeecd1 Add load priority order, such that preload becomes unnecessary in most cases
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@278132 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-20 19:35:02 +00:00
eliel 7a61a43adb Implement AstData API data providers as part of the GSOC 2010 project,
midterm evaluation.

Review: https://reviewboard.asterisk.org/r/757/



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@274727 f38db490-d61c-443f-a65b-d21fe96a405b
2010-07-08 14:48:42 +00:00
qwell 8d07966e39 Remove ABI differences that occured when compiling with DEBUG_THREADS.
"Bad Things" would happen if Asterisk was compiled with DEBUG_THREADS, but a
loaded module was not (or vice versa).  This also immensely simplifies the
lock code, since there are no longer 2 separate versions of them.

Review: https://reviewboard.asterisk.org/r/508/


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@258557 f38db490-d61c-443f-a65b-d21fe96a405b
2010-04-22 19:08:01 +00:00
kpfleming e299cf0653 Recorded merge of revisions 222152 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r222152 | kpfleming | 2009-10-05 20:16:36 -0500 (Mon, 05 Oct 2009) | 20 lines
  
  Fix ao2_iterator API to hold references to containers being iterated.
  
  See Mantis issue for details of what prompted this change.
  
  Additional notes:
  
  This patch changes the ao2_iterator API in two ways: F_AO2I_DONTLOCK
  has become an enum instead of a macro, with a name that fits our
  naming policy; also, it is now necessary to call
  ao2_iterator_destroy() on any iterator that has been
  created. Currently this only releases the reference to the container
  being iterated, but in the future this could also release other
  resources used by the iterator, if the iterator implementation changes
  to use additional resources.
  
  (closes issue #15987)
  Reported by: kpfleming
  
  Review: https://reviewboard.asterisk.org/r/383/
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@222176 f38db490-d61c-443f-a65b-d21fe96a405b
2009-10-06 01:24:24 +00:00
tilghman d1ec1aa57d AST-2009-005
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@211539 f38db490-d61c-443f-a65b-d21fe96a405b
2009-08-10 19:20:57 +00:00
kpfleming 230a66da7d Const-ify the world (or at least a good part of it)
This patch adds 'const' tags to a number of Asterisk APIs where they are appropriate (where the API already demanded that the function argument not be modified, but the compiler was not informed of that fact). The list includes:

- CLI command handlers
- CLI command handler arguments
- AGI command handlers
- AGI command handler arguments
- Dialplan application handler arguments
- Speech engine API function arguments

In addition, various file-scope and function-scope constant arrays got 'const' and/or 'static' qualifiers where they were missing.

Review: https://reviewboard.asterisk.org/r/251/



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@196072 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-21 21:13:09 +00:00
kpfleming f58bc31e46 add 'const' qualifiers in various places where they should have been
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@193832 f38db490-d61c-443f-a65b-d21fe96a405b
2009-05-12 13:59:35 +00:00
tilghman 2dfad9bd0e Merge changes from str_substitution that are unrelated to that branch.
Included is a small bugfix to an ast_str helper, but most of these changes
are simply doxygen fixes.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@185912 f38db490-d61c-443f-a65b-d21fe96a405b
2009-04-01 20:13:28 +00:00
kpfleming 8e77cd3e6e a few more namespace updates... res_ael_share still needs some work before this can be merged to other release branches
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@182848 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-18 02:39:36 +00:00
tilghman a9e3b506a0 Oops, wrong direction of command
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@178573 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-25 19:03:35 +00:00
tilghman 48707e53d9 ODBC transaction support
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177320 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-19 00:26:01 +00:00
tilghman 2a22b3a479 Add assertions in the quest to track down a refcount leak.
(closes issue #14485)
 Reported by: davevg


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@176592 f38db490-d61c-443f-a65b-d21fe96a405b
2009-02-17 18:49:20 +00:00
kpfleming a343f7a275 ast_str_SQLGetData is *not* part of the ast_str API, it's part of the ast_odbc API and just happens to use an ast_str as the buffer; move all of it to res_odbc.c and res_odbc.h, renaming appropriately
along the way fix some minor coding style issues in strings.h and add some attribute_pure annotations to functions in the ast_str API



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@169438 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-19 21:42:46 +00:00
kpfleming fe480759d9 remove the PBX_ODBC logic from the configure script, and add GENERIC_ODCB logic that includes copying the relevant LIB and INCLUDE data from either UnixODBC or iODBC, based on which was found; if both were found, prefer UnixODBC
this stops modules from being linked against both sets of libraries on systems that have both installed



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@168734 f38db490-d61c-443f-a65b-d21fe96a405b
2009-01-15 20:18:53 +00:00
mmichelson 3624614b45 Fix crashes in res_odbc.
The variable "class" was being set NULL just prior to
being dereferenced in an ao2_link call. I have moved
the setting of the variable to NULL until after the
ao2_link call.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@165724 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-18 19:34:33 +00:00
tilghman 17d5723603 Fix reference counts of the class and add an assertion to the end.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@165541 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-18 16:36:48 +00:00
mmichelson 2af0b38961 Fix a refcount leak in res_odbc
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@165330 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-17 21:46:19 +00:00
eliel 6e243a5434 Janitor, use ARRAY_LEN() when possible.
(closes issue #13990)
Reported by: eliel
Patches:
      array_len.diff uploaded by eliel (license 64)



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@161218 f38db490-d61c-443f-a65b-d21fe96a405b
2008-12-05 10:31:25 +00:00
kpfleming a73e71ff1e improve configure script to remember the previous value of each dependency in build_tools/menuselect-deps, so that (once it has been written) menuselect can use this information to warn the user when a previously met dependency is no longer met
along the way, change tags used in configure script, menuselect-deps and code for various dependencies to be consistently named



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@154151 f38db490-d61c-443f-a65b-d21fe96a405b
2008-11-04 15:07:54 +00:00
seanbright fffaf0b978 Keep up with shadow warnings. One day I'll actually enable this in the Makefile.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@147457 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-08 12:15:06 +00:00
mvanbaak 7c30763fbe All ODBC parts can now use either unixodbc or iodbc.
This allows for the ODBC parts to work on OpenBSD as well.

99.99% of the work is done by seanbright (bow, bow) and I actually
did nothing but test and yell at him that it still didn't work :)

Thanks for helping out !


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@146925 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-06 23:14:33 +00:00
tilghman ad42a78d9d Merged revisions 145751 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r145751 | tilghman | 2008-10-02 10:13:21 -0500 (Thu, 02 Oct 2008) | 3 lines
  
  Some sanity checks that may have led to prior crashes, found by codefreeze-lap
  (murf) on IRC.  Also some cleanup of incorrectly-used constants.
........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@145752 f38db490-d61c-443f-a65b-d21fe96a405b
2008-10-02 15:17:16 +00:00
tilghman 95bae85759 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: http://svn.digium.com/svn/asterisk/trunk@142992 f38db490-d61c-443f-a65b-d21fe96a405b
2008-09-12 23:30:03 +00:00
tilghman 649c9d9460 Merged revisions 137138 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r137138 | tilghman | 2008-08-10 19:20:38 -0500 (Sun, 10 Aug 2008) | 5 lines

Deallocate database connection handle on disconnect, as we allocate another
one on connect.
(closes issue #13271)
 Reported by: dveiga

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137150 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-11 00:25:28 +00:00
seanbright 1013afa1ad All of the res/ stuff (other than res_jabber) from the RSW branch.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@137028 f38db490-d61c-443f-a65b-d21fe96a405b
2008-08-10 00:47:56 +00:00
murf 2948da9e2d a small change to make things compile
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@130296 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11 21:50:21 +00:00
tilghman 5e34d71fb5 Don't copy on NULL.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@130234 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11 19:56:34 +00:00
tilghman 03b8be1724 Add some debug code and add a missing release
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@130232 f38db490-d61c-443f-a65b-d21fe96a405b
2008-07-11 19:53:38 +00:00
tilghman 2a6397c89e Move the table cache routines to res_odbc, so they can be used from other
places (app_voicemail, for example).
(Related to bug #11678)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@121683 f38db490-d61c-443f-a65b-d21fe96a405b
2008-06-10 21:14:58 +00:00
tilghman 056f6458fb Protect the object from changing while the 'odbc show' CLI command is running
(Closes issue #12704)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@118129 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-23 18:09:14 +00:00
tilghman 60c5b78a7e Increase limit of unshared connections from 1023 to 4.2 billion.
(Related to issue #12677)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117264 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-20 16:25:16 +00:00
tilghman dce9004ba8 Revert part of previous fix, and heavily comment the logic for object
destruction, for future users.
(Closes issue #12677)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117262 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-20 16:13:48 +00:00
file 65117da50c Remove a premature mutex destroy (the destruction callback will end up destroying it) and use a callback to purge remaining classes.
(closes issue #12677)
Reported by: falves11


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@117133 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-19 16:22:56 +00:00
tilghman 63834a4e15 Don't free the object on destroy, as astobj2 takes care of that for you
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@115525 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-07 18:40:21 +00:00
tilghman 6319eab542 Merge refcounting of res_odbc
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@115337 f38db490-d61c-443f-a65b-d21fe96a405b
2008-05-05 23:38:15 +00:00
tilghman e2d7ac6e3f Clarify the pooling functionality by changing the config file keyword
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@101824 f38db490-d61c-443f-a65b-d21fe96a405b
2008-02-01 18:08:44 +00:00
tilghman e813ac0052 Merged revisions 99775 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r99775 | tilghman | 2008-01-22 22:20:15 -0600 (Tue, 22 Jan 2008) | 2 lines

Oops, should have checked for a NULL obj, here, too

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@99776 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-23 04:25:33 +00:00
tilghman 5e9b43a632 Merged revisions 99341 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r99341 | tilghman | 2008-01-21 12:11:07 -0600 (Mon, 21 Jan 2008) | 8 lines

Permit the user to specify number of seconds that a connection may remain idle,
which fixes a crash on reconnect with the MyODBC driver.
(closes issue #11798)
 Reported by: Corydon76
 Patches: 
       20080119__res_odbc__idlecheck.diff.txt uploaded by Corydon76 (license 14)
 Tested by: mvanbaak

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@99350 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-21 18:15:57 +00:00
tilghman 9ee1b6fabe Permit username and password to be NULL (which enables pass-through from the layer above).
Reported by: lurcher
Patch by: tilghman
(Closes issue #11739)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@99017 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-18 06:52:18 +00:00
tilghman 7b0ce5ebec Merged revisions 98467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r98467 | tilghman | 2008-01-11 18:05:08 -0600 (Fri, 11 Jan 2008) | 4 lines

Add a connection timeout attribute, as that was what was intended with the
login timeout, but ODBC divides it up into 2 different timeouts.
(Closes issue #11745)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@98487 f38db490-d61c-443f-a65b-d21fe96a405b
2008-01-12 00:17:26 +00:00