svn commit: r242095 - stable/9/usr.sbin/ppp

[Nick Hibma]

Author: n_hibma
Date: Thu Oct 25 20:45:57 2012
New Revision: 242095
URL: http://svn.freebsd.org/changeset/base/242095

Log:
  MFC 241496:
  
  	Some 3G modems return the wrong signature in echo packets and make it
  	impossible to use LQR/ECHO. They return want_magic instead.
  
  	With this change it is now possible to use
  
  		enable lqr
  		set lqrperiod 5
  		enable echo
  		set echoperiod 5
  
  	in your ppp.conf file.

Modified:
  stable/9/usr.sbin/ppp/lqr.c
Directory Properties:
  stable/9/usr.sbin/ppp/   (props changed)

Modified: stable/9/usr.sbin/ppp/lqr.c
==============================================================================
--- stable/9/usr.sbin/ppp/lqr.c	Thu Oct 25 20:34:44 2012	(r242094)
+++ stable/9/usr.sbin/ppp/lqr.c	Thu Oct 25 20:45:57 2012	(r242095)
@@ -108,7 +108,8 @@ lqr_RecvEcho(struct fsm *fp, struct mbuf
        *      die as a result.
        */
     }
-    if (lqr.signature == SIGNATURE) {
+    if (lqr.signature == SIGNATURE
+	|| lqr.signature == lcp->want_magic) {			/* some implementations return the wrong magic */
       /* careful not to update lqm.echo.seq_recv with older values */
       if ((hdlc->lqm.echo.seq_recv > (u_int32_t)0 - 5 && lqr.sequence < 5) ||
           (hdlc->lqm.echo.seq_recv <= (u_int32_t)0 - 5 &&