From 815d2413ff319560d6786398a3ea08e629efe389 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Tue, 3 Jan 2006 17:08:35 +0000
Subject: [PATCH] fix breakage from rev 7730 (failure to unlock list in
get_proto) minor cleanups and simpler usage of list macros
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7739 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
rtp.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/rtp.c b/rtp.c
index 3f0f7452a6..bb72376f66 100644
--- a/rtp.c
+++ b/rtp.c
@@ -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;
--
GitLab