diff options
| author | Olle Johansson <oej@edvina.net> | 2006-04-17 13:22:31 +0000 |
|---|---|---|
| committer | Olle Johansson <oej@edvina.net> | 2006-04-17 13:22:31 +0000 |
| commit | bdb2332621db66f28c3fc2f261e09196df0f6a2d (patch) | |
| tree | 3a18f434c6bb591c7a942f3251eded8bea90a139 /channels/chan_sip.c | |
| parent | bedd0c2ed34bd29c3eee544dfbf877ee3a38278b (diff) | |
- Documentation update
- Formatting change
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20901 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 039712e4f..d06d436c3 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -823,9 +823,9 @@ static struct sip_pvt { #define FLAG_RESPONSE (1 << 0) #define FLAG_FATAL (1 << 1) -/*! \brief sip packet - read in sipsock_read(), transmitted in send_request() */ +/*! \brief sip packet - raw format for outbound packets that are sent or scheduled for transmission */ struct sip_pkt { - struct sip_pkt *next; /*!< Next packet */ + struct sip_pkt *next; /*!< Next packet in linked list */ int retrans; /*!< Retransmission number */ int method; /*!< SIP method for this packet */ int seqno; /*!< Sequence number */ @@ -4874,10 +4874,8 @@ static int determine_firstline_parts( struct sip_request *req ) static int transmit_reinvite_with_sdp(struct sip_pvt *p) { struct sip_request req; - if (ast_test_flag(&p->flags[0], SIP_REINVITE_UPDATE)) - reqprep(&req, p, SIP_UPDATE, 0, 1); - else - reqprep(&req, p, SIP_INVITE, 0, 1); + + reqprep(&req, p, ast_test_flag(&p->flags[0], SIP_REINVITE_UPDATE) ? SIP_UPDATE : SIP_INVITE, 0, 1); add_header(&req, "Allow", ALLOWED_METHODS); add_header(&req, "Supported", SUPPORTED_EXTENSIONS); |