← Back to branch summary

~noskcaj/ubuntu/saucy/sflphone/merge-1.2.3-2

« back to all changes in this revision

Viewing changes to daemon/libs/iax2/iax.c

  • Committer: Package Import Robot
  • Author(s): Francois Marier
  • Date: 2012-02-18 21:47:09 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120218214709-6362d71gqdsdkrj5
Tags: 1.0.2-1
http://bugs.debian.org/658987
* New upstream release
  - remove logging patch (applied upstream)
  - update s390 patch since it was partially applied upstream
* Include the Evolution plugin as a separate binary package

* Fix compilation issues on SH4 (closes: #658987)
* Merge Ubuntu's binutils-gold linking fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/libs/iax2/iax.c
2179
2179
                        if (cur->peercallno == 0) {
2180
2180
                                cur->peercallno = callno;
2181
2181
                        }
2182
 
                        else if ( cur->peercallno != callno ) 
 
2182
                        else if ( cur->peercallno != callno )
2183
2183
                        {
2184
2184
                                // print a warning when the callno's don't match
2185
2185
                                fprintf( stderr, "WARNING: peercallno does not match callno"
2551
2551
                        DEBU(G "Packet arrived out of order (expecting %d, got %d) (frametype = %d, subclass = %d)\n",
2552
2552
                                session->iseqno, fh->oseqno, fh->type, subclass);
2553
2553
                        
2554
 
                        /* 
 
2554
                        /*
2555
2555
                         * Check if session->iseqno > fh->oseqno, accounting for possible wrap around
2556
2556
                         * This is correct if the two values are not equal (which, in this case, is guaranteed)
2557
2557
                         */