diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-19 23:47:23 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-19 23:47:23 +0000 |
| commit | 6b531045b69ca0426150a216fa0de4787bd5db9e (patch) | |
| tree | 3ce07974b31ca89430880dbca1b22ac2bc76a09b /channels | |
| parent | 88479e0b7791bd235d19b6d14fd901a16be62e68 (diff) | |
I messed up and accidently committed this to the trunk first ...
- add note on required values of sip_methods struct
- remove duplicate function prototype
- remove duplicate ast_mutex_lock (issue #6025)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@7529 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 97dd7b5e7..0b1bc96a9 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? */ @@ -874,7 +875,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); @@ -2730,7 +2730,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) |