Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 25 Oct 2012 21:08:31 +0000 (UTC)
From:      Nick Hibma <n_hibma@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r242098 - stable/8/usr.sbin/ppp
Message-ID:  <201210252108.q9PL8VJx046418@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: n_hibma
Date: Thu Oct 25 21:08:31 2012
New Revision: 242098
URL: http://svn.freebsd.org/changeset/base/242098

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/8/usr.sbin/ppp/lqr.c
Directory Properties:
  stable/8/usr.sbin/ppp/   (props changed)

Modified: stable/8/usr.sbin/ppp/lqr.c
==============================================================================
--- stable/8/usr.sbin/ppp/lqr.c	Thu Oct 25 21:08:02 2012	(r242097)
+++ stable/8/usr.sbin/ppp/lqr.c	Thu Oct 25 21:08:31 2012	(r242098)
@@ -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 &&



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210252108.q9PL8VJx046418>