diff options
| author | Russell Bryant <russell@russellbryant.com> | 2005-12-19 23:41:53 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2005-12-19 23:41:53 +0000 |
| commit | dca08fd8783e717d6570747aad119225651c483f (patch) | |
| tree | b87bb5c789f523752c106a2422fa0b04a1f89bc9 | |
| parent | 154d9ada809f8edf2beb167c1dfd6516c47294a9 (diff) | |
- add note on required values of sip_methods struct
- remove duplicate function prototype
- remove duplicate ast_mutex_lock (issue #6025)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index dcb7766b0..0cbd4b5df 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -202,6 +202,7 @@ enum sip_auth_type { WWW_AUTH, }; +/*! XXX Note that sip_methods[i].id == i must hold or the code breaks */ static const struct cfsip_methods { enum sipmethod id; int need_rtp; /*!< when this is the 'primary' use for a pvt structure, does it need RTP? */ @@ -878,7 +879,6 @@ struct ast_config *notify_types; static struct sip_auth *authl; /*!< Authentication list */ -static struct ast_frame *sip_read(struct ast_channel *ast); static int transmit_response(struct sip_pvt *p, char *msg, struct sip_request *req); static int transmit_response_with_sdp(struct sip_pvt *p, char *msg, struct sip_request *req, int retrans); static int transmit_response_with_unsupported(struct sip_pvt *p, char *msg, struct sip_request *req, char *unsupported); @@ -2734,7 +2734,6 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, char *title) tmp->tech = &sip_tech; /* Select our native format based on codec preference until we receive something from another device to the contrary. */ - ast_mutex_lock(&i->lock); if (i->jointcapability) tmp->nativeformats = ast_codec_choose(&i->prefs, i->jointcapability, 1); else if (i->capability) |