dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Fix SIP buglets 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3965 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2004-10-09 20:08:41 +00:00
parent 94e2ddbc04
commit b165c5aad8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
channels/chan_sip.c
View File

@ -1098,7 +1098,7 @@ static struct sip_peer *realtime_peer(const char *peername, struct sockaddr_in *
}
ast_destroy_realtime(var);
}
return NULL;
return peer;
}
/*--- find_peer: Locate peer by name or ip address */
@ -5341,12 +5341,15 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, char *cmd
if (user && debug)
ast_verbose("Found user '%s'\n", user->name);
} else {
if (user && debug)
ast_verbose("Found user '%s', but fails host access\n", user->name);
if (user) {
if (debug)
ast_verbose("Found user '%s', but fails host access\n", user->name);
if (user->temponly)
destroy_user(user);
}
user = NULL;
}
if (user && user->temponly)
destroy_user(user);
/* Temp user gets cleaned up at the end */
ast_mutex_unlock(&userl.lock);
if (!user) {
/* If we didn't find a user match, check for peers */
@ -5429,9 +5432,8 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, char *cmd
}
if (user && user->temponly) {
if (user && user->temponly)
destroy_user(user);
}
return res;
}

1
res/res_config_odbc.c
View File

@ -128,6 +128,7 @@ static struct ast_variable *realtime_odbc(const char *database, const char *tabl
return NULL;
}
for (x=0;x<colcount;x++) {
rowdata[0] = '\0';
collen = sizeof(coltitle);
res = SQLDescribeCol(stmt, x + 1, coltitle, sizeof(coltitle), &collen,
&datatype, &colsize, &decimaldigits, &nullable);