From owner-svn-src-all@FreeBSD.ORG  Thu Oct 25 21:08:32 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 23A7072B;
 Thu, 25 Oct 2012 21:08:32 +0000 (UTC)
 (envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 0B5C68FC0A;
 Thu, 25 Oct 2012 21:08:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9PL8VOG046420;
 Thu, 25 Oct 2012 21:08:31 GMT (envelope-from n_hibma@svn.freebsd.org)
Received: (from n_hibma@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9PL8VJx046418;
 Thu, 25 Oct 2012 21:08:31 GMT (envelope-from n_hibma@svn.freebsd.org)
Message-Id: <201210252108.q9PL8VJx046418@svn.freebsd.org>
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 25 Oct 2012 21:08:31 +0000 (UTC)
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
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Oct 2012 21:08:32 -0000

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 &&