[Pkg-voip-commits] r6047 - in /libpri/trunk/debian: changelog patches/bristuff.dpatch

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Aug 19 12:06:50 2008
New Revision: 6047

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6047
Log:
* libpri.dpatch: Don't further process an  unassigned TEI event.

Modified:
    libpri/trunk/debian/changelog
    libpri/trunk/debian/patches/bristuff.dpatch

Modified: libpri/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/changelog?rev=6047&op=diff
==============================================================================
--- libpri/trunk/debian/changelog (original)
+++ libpri/trunk/debian/changelog Tue Aug 19 12:06:50 2008
@@ -3,6 +3,7 @@
   [ Tzafrir Cohen ]
   * libpri.dpatch: When getting a SABME/UA after sending one, don't reset 
     state.
+  * libpri.dpatch: Don't further process an  unassigned TEI event.
 
   [ Mark Purcell ]
   * lenny release candidate ;-)

Modified: libpri/trunk/debian/patches/bristuff.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/libpri/trunk/debian/patches/bristuff.dpatch?rev=6047&op=diff
==============================================================================
--- libpri/trunk/debian/patches/bristuff.dpatch (original)
+++ libpri/trunk/debian/patches/bristuff.dpatch Tue Aug 19 12:06:50 2008
@@ -3751,15 +3751,7 @@
  			} else 
  				pri_error(pri, "!! Weird frame received (m3=3, m2 = %d)\n", h->u.m2);
  			break;
-@@ -916,20 +1793,44 @@ static pri_event *__q921_receive(struct 
- 	pri_event *ev;
- 	/* Discard FCS */
- 	len -= 2;
--	
--	if (!pri->master && pri->debug & (PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_RAW))
--		q921_dump(pri, h, len, pri->debug & PRI_DEBUG_Q921_RAW, 0);
- 
- 	/* Check some reject conditions -- Start by rejecting improper ea's */
+@@ -916,12 +1793,37 @@ static pri_event *__q921_receive(struct 
  	if (h->h.ea1 || !(h->h.ea2))
  		return NULL;
  
@@ -3788,12 +3780,10 @@
 + 		    // send DM
 + 		    q921_send_dm(pri, 1, h->h.tei);
 + 		    pri->q921_teis[h->h.tei - Q921_TEI_BASE] = 1;
++		    return NULL;
 + 		}
 + 	    }
 + 	}
-+
-+	if (!pri->master && pri->debug & (PRI_DEBUG_Q921_DUMP | PRI_DEBUG_Q921_RAW))
-+		q921_dump(pri, h, len, pri->debug & PRI_DEBUG_Q921_RAW, 0);
  
  	/* Check for SAPIs we don't yet handle */
 -	if ((h->h.sapi != pri->sapi) || (h->h.tei != pri->tei)) {