Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Formatting and doxygen fixes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36180 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Olle Johansson 20 years ago
parent 5e2ccc9821
commit f12f5b7c6c
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File

42
channels/chan_sip.c
Unescape View File

@ -828,9 +828,9 @@ struct sip_refer {
char referred_by[AST_MAX_EXTENSION]; /*!< Place to store REFERRED-BY extension */ char referred_by[AST_MAX_EXTENSION]; /*!< Place to store REFERRED-BY extension */
char referred_by_name[AST_MAX_EXTENSION]; /*!< Place to store REFERRED-BY extension */ char referred_by_name[AST_MAX_EXTENSION]; /*!< Place to store REFERRED-BY extension */
char refer_contact[AST_MAX_EXTENSION]; /*!< Place to store Contact info from a REFER extension */ char refer_contact[AST_MAX_EXTENSION]; /*!< Place to store Contact info from a REFER extension */
char replaces_callid[BUFSIZ]; /*!< Replace info */ char replaces_callid[BUFSIZ]; /*!< Replace info: callid */
char replaces_callid_totag[BUFSIZ/2]; /*!< Replace info */ char replaces_callid_totag[BUFSIZ/2]; /*!< Replace info: to-tag */
char replaces_callid_fromtag[BUFSIZ/2]; /*!< Replace info */ char replaces_callid_fromtag[BUFSIZ/2]; /*!< Replace info: from-tag */
struct sip_pvt *refer_call; /*!< Call we are referring */ struct sip_pvt *refer_call; /*!< Call we are referring */
int attendedtransfer; /*!< Attended or blind transfer? */ int attendedtransfer; /*!< Attended or blind transfer? */
int localtransfer; /*!< Transfer to local domain? */ int localtransfer; /*!< Transfer to local domain? */
@ -871,15 +871,14 @@ static struct sip_pvt {
AST_STRING_FIELD(okcontacturi); /*!< URI from the 200 OK on INVITE */ AST_STRING_FIELD(okcontacturi); /*!< URI from the 200 OK on INVITE */
AST_STRING_FIELD(peersecret); /*!< Password */ AST_STRING_FIELD(peersecret); /*!< Password */
AST_STRING_FIELD(peermd5secret); AST_STRING_FIELD(peermd5secret);
AST_STRING_FIELD(cid_num); /*!< Caller*ID */ AST_STRING_FIELD(cid_num); /*!< Caller*ID number */
AST_STRING_FIELD(cid_name); /*!< Caller*ID */ AST_STRING_FIELD(cid_name); /*!< Caller*ID name */
AST_STRING_FIELD(via); /*!< Via: header */ AST_STRING_FIELD(via); /*!< Via: header */
AST_STRING_FIELD(fullcontact); /*!< The Contact: that the UA registers with us */ AST_STRING_FIELD(fullcontact); /*!< The Contact: that the UA registers with us */
AST_STRING_FIELD(our_contact); /*!< Our contact header */ AST_STRING_FIELD(our_contact); /*!< Our contact header */
AST_STRING_FIELD(rpid); /*!< Our RPID header */ AST_STRING_FIELD(rpid); /*!< Our RPID header */
AST_STRING_FIELD(rpid_from); /*!< Our RPID From header */ AST_STRING_FIELD(rpid_from); /*!< Our RPID From header */
); );
struct ast_codec_pref prefs; /*!< codec prefs */
unsigned int ocseq; /*!< Current outgoing seqno */ unsigned int ocseq; /*!< Current outgoing seqno */
unsigned int icseq; /*!< Current incoming seqno */ unsigned int icseq; /*!< Current incoming seqno */
ast_group_t callgroup; /*!< Call group */ ast_group_t callgroup; /*!< Call group */
@ -887,7 +886,8 @@ static struct sip_pvt {
int lastinvite; /*!< Last Cseq of invite */ int lastinvite; /*!< Last Cseq of invite */
struct ast_flags flags[2]; /*!< SIP_ flags */ struct ast_flags flags[2]; /*!< SIP_ flags */
int timer_t1; /*!< SIP timer T1, ms rtt */ int timer_t1; /*!< SIP timer T1, ms rtt */
unsigned int sipoptions; /*!< Supported SIP sipoptions on the other end */ unsigned int sipoptions; /*!< Supported SIP options on the other end */
struct ast_codec_pref prefs; /*!< codec prefs */
int capability; /*!< Special capability (codec) */ int capability; /*!< Special capability (codec) */
int jointcapability; /*!< Supported capability at both ends (codecs ) */ int jointcapability; /*!< Supported capability at both ends (codecs ) */
int peercapability; /*!< Supported peer capability */ int peercapability; /*!< Supported peer capability */
@ -901,40 +901,40 @@ static struct sip_pvt {
int callingpres; /*!< Calling presentation */ int callingpres; /*!< Calling presentation */
int authtries; /*!< Times we've tried to authenticate */ int authtries; /*!< Times we've tried to authenticate */
int expiry; /*!< How long we take to expire */ int expiry; /*!< How long we take to expire */
long branch; /*!< One random number */ long branch; /*!< The branch identifier of this session */
char tag[11]; /*!< Another random number */ char tag[11]; /*!< Our tag for this session */
int sessionid; /*!< SDP Session ID */ int sessionid; /*!< SDP Session ID */
int sessionversion; /*!< SDP Session Version */ int sessionversion; /*!< SDP Session Version */
struct sockaddr_in sa; /*!< Our peer */ struct sockaddr_in sa; /*!< Our peer */
struct sockaddr_in redirip; /*!< Where our RTP should be going if not to us */ struct sockaddr_in redirip; /*!< Where our RTP should be going if not to us */
struct sockaddr_in vredirip; /*!< Where our Video RTP should be going if not to us */ struct sockaddr_in vredirip; /*!< Where our Video RTP should be going if not to us */
time_t lastrtprx; /*!< Last RTP received */
time_t lastrtptx; /*!< Last RTP sent */
int rtptimeout; /*!< RTP timeout time */
int rtpholdtimeout; /*!< RTP timeout when on hold */
int rtpkeepalive; /*!< Send RTP packets for keepalive */
struct sockaddr_in recv; /*!< Received as */ struct sockaddr_in recv; /*!< Received as */
struct in_addr ourip; /*!< Our IP */ struct in_addr ourip; /*!< Our IP */
struct ast_channel *owner; /*!< Who owns us */ struct ast_channel *owner; /*!< Who owns us (if we have an owner) */
struct sip_route *route; /*!< Head of linked list of routing steps (fm Record-Route) */ struct sip_route *route; /*!< Head of linked list of routing steps (fm Record-Route) */
int route_persistant; /*!< Is this the "real" route? */ int route_persistant; /*!< Is this the "real" route? */
struct sip_auth *peerauth; /*!< Realm authentication */ struct sip_auth *peerauth; /*!< Realm authentication */
int noncecount; /*!< Nonce-count */ int noncecount; /*!< Nonce-count */
char lastmsg[256]; /*!< Last Message sent/received */ char lastmsg[256]; /*!< Last Message sent/received */
int amaflags; /*!< AMA Flags */ int amaflags; /*!< AMA Flags */
int pendinginvite; /*!< Any pending invite */ int pendinginvite; /*!< Any pending invite ? (seqno of this) */
struct sip_request initreq; /*!< Initial request that opened the SIP dialog */ struct sip_request initreq; /*!< Initial request that opened the SIP dialog */
int maxtime; /*!< Max time for first response */ int maxtime; /*!< Max time for first response */
int initid; /*!< Auto-congest ID if appropriate */ int initid; /*!< Auto-congest ID if appropriate (scheduler) */
int autokillid; /*!< Auto-kill ID */ int autokillid; /*!< Auto-kill ID (scheduler) */
time_t lastrtprx; /*!< Last RTP received */ enum transfermodes allowtransfer; /*!< REFER: restriction scheme */
time_t lastrtptx; /*!< Last RTP sent */ struct sip_refer *refer; /*!< REFER: SIP transfer data structure */
int rtptimeout; /*!< RTP timeout time */
int rtpholdtimeout; /*!< RTP timeout when on hold */
int rtpkeepalive; /*!< Send RTP packets for keepalive */
enum transfermodes allowtransfer; /*! SIP Refer restriction scheme */
enum subscriptiontype subscribed; /*!< SUBSCRIBE: Is this dialog a subscription? */ enum subscriptiontype subscribed; /*!< SUBSCRIBE: Is this dialog a subscription? */
int stateid; /*!< SUBSCRIBE: ID for devicestate subscriptions */ int stateid; /*!< SUBSCRIBE: ID for devicestate subscriptions */
int laststate; /*!< SUBSCRIBE: Last known extension state */ int laststate; /*!< SUBSCRIBE: Last known extension state */
int dialogver; /*!< SUBSCRIBE: Version for subscription dialog-info */ int dialogver; /*!< SUBSCRIBE: Version for subscription dialog-info */
struct sip_refer *refer; /*!< REFER: SIP transfer data structure */
struct ast_dsp *vad; /*!< Voice Activation Detection dsp */ struct ast_dsp *vad; /*!< Voice Activation Detection dsp */
struct sip_peer *relatedpeer; /*!< If this dialog is related to a peer, which one struct sip_peer *relatedpeer; /*!< If this dialog is related to a peer, which one
@ -14372,6 +14372,7 @@ restartsearch:
fastrestart = FALSE; fastrestart = FALSE;
curpeernum = 0; curpeernum = 0;
peer = NULL; peer = NULL;
/* Find next peer that needs mwi */
ASTOBJ_CONTAINER_TRAVERSE(&peerl, !peer, do { ASTOBJ_CONTAINER_TRAVERSE(&peerl, !peer, do {
if ((curpeernum > lastpeernum) && does_peer_need_mwi(iterator)) { if ((curpeernum > lastpeernum) && does_peer_need_mwi(iterator)) {
fastrestart = TRUE; fastrestart = TRUE;
@ -14381,6 +14382,7 @@ restartsearch:
curpeernum++; curpeernum++;
} while (0) } while (0)
); );
/* Send MWI to the peer */
if (peer) { if (peer) {
ASTOBJ_WRLOCK(peer); ASTOBJ_WRLOCK(peer);
sip_send_mwi_to_peer(peer); sip_send_mwi_to_peer(peer);

Write Preview
Loading…
Cancel
Save