[svn-commits] tilghman: tag 1.6.0.13 r211713 - in /tags/1.6.0.13: ./ channels/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Aug 11 11:11:59 CDT 2009
Author: tilghman
Date: Tue Aug 11 11:11:54 2009
New Revision: 211713
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=211713
Log:
Fixing bad merge
Modified:
tags/1.6.0.13/.version
tags/1.6.0.13/ChangeLog
tags/1.6.0.13/channels/chan_sip.c
Modified: tags/1.6.0.13/.version
URL: http://svn.asterisk.org/svn-view/asterisk/tags/1.6.0.13/.version?view=diff&rev=211713&r1=211712&r2=211713
==============================================================================
--- tags/1.6.0.13/.version (original)
+++ tags/1.6.0.13/.version Tue Aug 11 11:11:54 2009
@@ -1,1 +1,1 @@
-1.6.0.12
+1.6.0.13
Modified: tags/1.6.0.13/ChangeLog
URL: http://svn.asterisk.org/svn-view/asterisk/tags/1.6.0.13/ChangeLog?view=diff&rev=211713&r1=211712&r2=211713
==============================================================================
--- tags/1.6.0.13/ChangeLog (original)
+++ tags/1.6.0.13/ChangeLog Tue Aug 11 11:11:54 2009
@@ -1,4 +1,10 @@
-2009-08-09 Tilghman Lesher <tlesher at digium.com>
+2009-08-11 Tilghman Lesher <tlesher at digium.com>
+
+ * Asterisk 1.6.0.13 released
+
+ * channels/chan_iax2.c: Bad merge from 1.6.0 branch
+
+2009-08-10 Tilghman Lesher <tlesher at digium.com>
* Asterisk 1.6.0.12 released
Modified: tags/1.6.0.13/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/tags/1.6.0.13/channels/chan_sip.c?view=diff&rev=211713&r1=211712&r2=211713
==============================================================================
--- tags/1.6.0.13/channels/chan_sip.c (original)
+++ tags/1.6.0.13/channels/chan_sip.c Tue Aug 11 11:11:54 2009
@@ -18666,7 +18666,6 @@
* possibly process the request. In all cases, there function
* terminates at the end of this block
*/
-<<<<<<< .working
int ret = 0;
if (p->ocseq < seqno && seqno != p->lastnoninvite) {
@@ -18683,7 +18682,7 @@
append_history(p, "Ignore", "Ignoring this retransmit\n");
} else if (e) {
e = ast_skip_blanks(e);
- if (sscanf(e, "%d %n", &respid, &len) != 1) {
+ if (sscanf(e, "%30d %n", &respid, &len) != 1) {
ast_log(LOG_WARNING, "Invalid response: '%s'\n", e);
/* XXX maybe should do ret = -1; */
} else if (respid <= 0) {
@@ -18694,26 +18693,6 @@
if ((respid == 200) || ((respid >= 300) && (respid <= 399)))
extract_uri(p, req);
handle_response(p, respid, e + len, req, seqno);
-=======
- if (ast_strlen_zero(e)) {
- return 0;
- }
- if (sscanf(e, "%30d %n", &respid, &len) != 1) {
- ast_log(LOG_WARNING, "Invalid response: '%s'\n", e);
- return 0;
- }
- if (respid <= 0) {
- ast_log(LOG_WARNING, "Invalid SIP response code: '%d'\n", respid);
- return 0;
- }
- if (p->ocseq && (p->ocseq < seqno)) {
- if (option_debug)
- ast_log(LOG_DEBUG, "Ignoring out of order response %d (expecting %d)\n", seqno, p->ocseq);
- return -1;
- } else {
- if ((respid == 200) || ((respid >= 300) && (respid <= 399))) {
- extract_uri(p, req);
->>>>>>> .merge-right.r211551
}
}
return 0;
More information about the svn-commits
mailing list