kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix breakage from rev 7730 (failure to unlock list in get_proto)

Browse Source 
minor cleanups and simpler usage of list macros


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7739 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-01-03 17:08:35 +00:00
parent 142ef858a5
commit 815d2413ff
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rtp.c
View File

@@ -738,16 +738,16 @@ static void ast_rtp_pt_copy(struct ast_rtp *dest, struct ast_rtp *src)
/*! \brief Get channel driver interface structure */
static struct ast_rtp_protocol *get_proto(struct ast_channel *chan)
{
struct ast_rtp_protocol *cur;
struct ast_rtp_protocol *cur = NULL;
AST_LIST_LOCK(&protos);
AST_LIST_TRAVERSE(&protos, cur, list) {
if (cur->type == chan->type)
return cur;
break;
}
AST_LIST_UNLOCK(&protos);
return NULL;
return cur;
}
int ast_rtp_make_compatible(struct ast_channel *dest, struct ast_channel *src)
@@ -1533,16 +1533,8 @@ int ast_rtp_write(struct ast_rtp *rtp, struct ast_frame *_f)
/*! \brief Unregister interface to channel driver */
void ast_rtp_proto_unregister(struct ast_rtp_protocol *proto)
{
struct ast_rtp_protocol *cur;
AST_LIST_LOCK(&protos);
AST_LIST_TRAVERSE_SAFE_BEGIN(&protos, cur, list) {
if (cur == proto) {
AST_LIST_REMOVE_CURRENT(&protos, list);
break;
}
}
AST_LIST_TRAVERSE_SAFE_END
AST_LIST_REMOVE(&protos, proto, list);
AST_LIST_UNLOCK(&protos);
}
@@ -1553,7 +1545,7 @@ int ast_rtp_proto_register(struct ast_rtp_protocol *proto)
AST_LIST_LOCK(&protos);
AST_LIST_TRAVERSE(&protos, cur, list) {
if (cur->type == proto->type) {
if (!strcmp(cur->type, proto->type)) {
ast_log(LOG_WARNING, "Tried to register same protocol '%s' twice\n", cur->type);
AST_LIST_UNLOCK(&protos);
return -1;