kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-23 04:58:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not export the tzlock and the list head, and introduce a new method,

Browse Source 
ast_walk_indications(), to walk through the list of indications.
The new method returns an unlocked record, which is no different from the
behaviour of other existing methods in indications.c
(i.e. they all need to be fixed, with refcounts or some similar
method).

Note that ast_walk_indications() uses the pointer argument only as a
search key, so its implementation is completely safe.

In turn, this change allows the removal of AST_MUTEX_DEFINE_EXPORTED.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@16532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-03-30 17:10:11 +00:00
parent 6d2fbc0b90
commit 48864ab877
4 changed files with 40 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/snmp/agent.c
View File

@@ -631,22 +631,16 @@ static u_char *ast_var_indications(struct variable *vp, oid *name, size_t *lengt
int exact, size_t *var_len, WriteMethod **write_method)
{
static unsigned long long_ret;
struct tone_zone *tz;
struct tone_zone *tz = NULL;
if (header_generic(vp, name, length, exact, var_len, write_method))
return NULL;
switch (vp->magic) {
case ASTINDCOUNT:
if (ast_mutex_lock(&tzlock)) {
ast_log(LOG_WARNING, "Unable to lock tone_zones list\n");
snmp_log(LOG_ERR, "Unable to lock tone_zones list in ast_var_indications\n");
return NULL;
}
long_ret = 0;
for (tz = tone_zones; tz; tz = tz->next)
while ( (tz = ast_walk_indications(tz)) )
long_ret++;
ast_mutex_unlock(&tzlock);
return (u_char *)&long_ret;
case ASTINDCURRENT:
@@ -667,21 +661,15 @@ static u_char *ast_var_indications_table(struct variable *vp, oid *name, size_t
int exact, size_t *var_len, WriteMethod **write_method)
{
static unsigned long long_ret;
struct tone_zone *tz;
struct tone_zone *tz = NULL;
int i;
if (header_simple_table(vp, name, length, exact, var_len, write_method, -1))
return NULL;
if (ast_mutex_lock(&tzlock)) {
ast_log(LOG_WARNING, "Unable to lock tone_zones list\n");
snmp_log(LOG_ERR, "Unable to lock tone_zones list in ast_var_indications_table\n");
return NULL;
}
i = name[*length - 1] - 1;
for (tz = tone_zones; tz && i; tz = tz->next)
i--;
ast_mutex_unlock(&tzlock);
while ( (tz = ast_walk_indications(tz)) && i )
i--;
if (tz == NULL)
return NULL;