lun feb 24 22:10:09 CET 2003

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index b71459b6d851d2b1d43619323034a9c783a31f93..4991352ef1304204d25a5dd625b42b40eca881a4 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2037,10 +2037,9 @@ static int parse_contact(struct sip_pvt *pvt, struct sip_peer *p, struct sip_req
        }
        /* Make sure it's a SIP URL */
        if (strncasecmp(c, "sip:", 4)) {
-               ast_log(LOG_NOTICE, "'%s' is not a valid SIP contcact\n", c);
-               return -1;
-       }
-       c += 4;
+               ast_log(LOG_NOTICE, "'%s' is not a valid SIP contact (missing sip:) trying to use anyway\n", c);
+       } else
+               c += 4;
        /* Ditch q */
        n = strchr(c, ';');
        if (n) 
@@ -2203,11 +2202,12 @@ static int register_verify(struct sip_pvt *p, struct sockaddr_in *sin, struct si
        
        strncpy(tmp, get_header(req, "To"), sizeof(tmp) - 1);
        c = ditch_braces(tmp);
-       if (strncmp(c, "sip:", 4)) {
-               ast_log(LOG_NOTICE, "Invalid to address: '%s' from %s\n", tmp, inet_ntoa(sin->sin_addr));
-               return -1;
+       if (!strncmp(c, "sip:", 4)) {
+               name = c + 4;
+       } else {
+               name = c;
+               ast_log(LOG_NOTICE, "Invalid to address: '%s' from %s (missing sip:) trying to use anyway...\n", c, inet_ntoa(sin->sin_addr));
        }
-       name = c + 4;
        c = strchr(name, '@');
        if (c) 
                *c = '\0';
@@ -2434,9 +2434,9 @@ static int check_user(struct sip_pvt *p, struct sip_request *req, char *cmd, cha
        of = get_header(req, "From");
        strncpy(from, of, sizeof(from) - 1);
        of = ditch_braces(from);
-       if (strncmp(of, "sip:", 4))
-               return 0;
-       else
+       if (strncmp(of, "sip:", 4)) {
+               ast_log(LOG_NOTICE, "From address missing 'sip:', using it anyway\n");
+       } else
                of += 4;
        /* Get just the username part */
        if ((c = strchr(of, '@')))
@@ -3299,6 +3299,7 @@ static int handle_request(struct sip_pvt *p, struct sip_request *req, struct soc
                                }
                        }
                        transmit_request(p, "BYE", p->outgoing);
+                       p->alreadygone = 1;
                }
        } else if (!strcasecmp(cmd, "CANCEL") || !strcasecmp(cmd, "BYE")) {
                copy_request(&p->initreq, req);

diff --git a/rtp.c b/rtp.c
index aba47dbb5b4e9e0d5f0e2413e2fab589a566c255..7dd6e997cd4222ad2d24a872d552bb8b69d4e234 100755 (executable)
--- a/rtp.c
+++ b/rtp.c
@@ -494,6 +494,9 @@ static unsigned int calc_txstamp(struct ast_rtp *rtp)
        gettimeofday(&now, NULL);
        ms = (now.tv_sec - rtp->txcore.tv_sec) * 1000;
        ms += (now.tv_usec - rtp->txcore.tv_usec) / 1000;
+       /* Use what we just got for next time */
+       rtp->txcore.tv_sec = now.tv_sec;
+       rtp->txcore.tv_usec = now.tv_usec;
        return ms;
 }
 
@@ -529,7 +532,7 @@ int ast_rtp_senddigit(struct ast_rtp *rtp, char digit)
 
        ms = calc_txstamp(rtp);
        /* Default prediction */
-       pred = ms * 8;
+       pred = rtp->lastts + ms * 8;
        
        /* Get a pointer to the header */
        rtpheader = (unsigned int *)data;
@@ -568,7 +571,7 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
 
        ms = calc_txstamp(rtp);
        /* Default prediction */
-       pred = ms * 8;
+       pred = rtp->lastts + ms * 8;
        
        switch(f->subclass) {
        case AST_FORMAT_ULAW:
@@ -591,16 +594,12 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
        }
 
        /* Re-calculate last TS */
-       rtp->lastts = ms * 8;
-#if 0  /* XXX Experiment -- Make timestamp always relative XXX */
+       rtp->lastts = rtp->lastts + ms * 8;
        /* If it's close to ou prediction, go for it */
        if (abs(rtp->lastts - pred) < 640)
-#endif 
                rtp->lastts = pred;
-#if 0
        else
-               printf("Difference is %d, ms is %d\n", abs(rtp->lastts - pred), ms);
-#endif                 
+               ast_log(LOG_DEBUG, "Difference is %d, ms is %d\n", abs(rtp->lastts - pred), ms);
        /* Get a pointer to the header */
        rtpheader = (unsigned int *)(f->data - hdrlen);
        rtpheader[0] = htonl((2 << 30) | (codec << 16) | (rtp->seqno++));