struct sip_request cleanup:

- remove a debug field that was read but never set, so it was basically
  unused as well as the code testing it (also removed);

- make scalar fields contiguous so any array overflow will be
  less harmful;

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@18787 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index abee70e..8f4f700 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -482,12 +482,11 @@ struct sip_request {
        int len;                /*!< Length */
        int headers;            /*!< # of SIP Headers */
        int method;             /*!< Method of this request */
-       char *header[SIP_MAX_HEADERS];
        int lines;              /*!< SDP Content */
+       unsigned int flags;     /*!< SIP_PKT Flags for this packet */
+       char *header[SIP_MAX_HEADERS];
        char *line[SIP_MAX_LINES];
        char data[SIP_MAX_PACKET];
-       int debug;              /*!< Debug flag for this packet */
-       unsigned int flags;     /*!< SIP_PKT Flags for this packet */
 };
 
 /*! \brief structure used in transfers */
@@ -10156,8 +10155,6 @@ static void handle_response(struct sip_pvt *p, int resp, char *rest, struct sip_
        } else {        
                /* Responses to OUTGOING SIP requests on INCOMING calls 
                   get handled here. As well as out-of-call message responses */
-               if (req->debug)
-                       ast_verbose("SIP Response message for INCOMING dialog %s arrived\n", msg);
                if (resp == 200) {
                        /* Tags in early session is replaced by the tag in 200 OK, which is 
                        the final reply to our INVITE */