From patchwork Tue Oct 24 14:20:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Vandeputte X-Patchwork-Id: 829915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ng3gtHXb"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ncentric.com header.i=@ncentric.com header.b="irL8xIAg"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yLwSR3YkXz9sBd for ; Wed, 25 Oct 2017 01:21:43 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=QAYy0i2NBi7ESCcTwGEPuRD7+opMmP3Z5T9Zn9uLSE8=; b=ng3gtHXbqbdoPT eV3rfrkiKG73AHWC7DFJq9sWdvpyx0FM44fXUAXJKKzzP2U+NSEf7bhC0WsDmftwmJC6tluJ1eS19 Z9hsdgIzEBRhf2lJ36bIoaSn7FoOFbmbMFfSFFeSnoNWngvJ7wh/TAQLmjFUdklLp6Pk88ZtqEhvc kGRtBvtFkRqbkGZ67c5ZMYQIdM4rZlCh6EFLBOqc3NPKcllJQqQTP4Q3Z58IKI7DnqaEcalFVh+tD X98nnDI11cWS3otnRtTtvWLw7YV5LDKGXkw9j5aDcQTokpX+l/7HlUvuPnRyWcelx/4N8gGLh43wg HyV/EnfnSuPSVQbPrYZQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e705O-0000m7-1V; Tue, 24 Oct 2017 14:21:42 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e705J-0000j7-LP for lede-dev@lists.infradead.org; Tue, 24 Oct 2017 14:21:39 +0000 Received: by mail-wm0-x242.google.com with SMTP id b189so15964132wmd.4 for ; Tue, 24 Oct 2017 07:21:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncentric.com; s=google; h=from:to:cc:subject:date:message-id; bh=UVEEhWAQAdnb1GwlYJAii+stppmmH2w/vjXqFVKbVwU=; b=irL8xIAgGg97qsIJJlwRO/9k9pNiXWELS93rMpP7TUBBMeZokYHfc+jTKnyD0Pan6/ 3au9Y6kg3z7VVcAVolaQV5XyWbp2eIz50j910wblhKPfsrA2ChBQuUi5HSwYxPFp7eOI B8FCC5Dbmcik0BnoM1dCmX5VuWr+FlYcgNCpc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=UVEEhWAQAdnb1GwlYJAii+stppmmH2w/vjXqFVKbVwU=; b=hPSCEPFJyB7lQ+0oNkr/s4eFK1G7/W37r3toERdzD2CQkttN0v045kuND5zPGFMjMY PzWXauDwo5jD8DgVI817r71woPIe7wQlEsd9SfrOPGiXpDyEwI0dz3JXko2swg/dD8KL qCoRfwXxSvVBETgRnzVC5csrrHIpSKmphRjEWTKi+E78vEfsbmoBQZc75MlGAaQ0/kDF 1f5YIS3dgW+8Ao4xUywgMs8qMvVQOJDyDljZbe85FkqNl52bcKF6W+TV5jm3/rsJIEXr 5RsuxuubWxKM2N0CR/r8NuoukXhvwX+UsfGHradNwIQZ+lLohSph08+GZZK1Gy0MNmCD 2GrA== X-Gm-Message-State: AMCzsaW53Y61CXhinwJZ7gFJrppjXzqEFJZ1N6uXDYFliJOganoLdT3A rbdLCKfm2fFCWScgQTjMbgoVY/fTkt4= X-Google-Smtp-Source: ABhQp+RqnxNRCpuhVP4ofKhOxSh38OOTaeqwJq0BaNsInpzQ+ovoLhZFGSc483sEOH7T8m0ZODc3KA== X-Received: by 10.80.205.10 with SMTP id z10mr1920515edi.264.1508854875273; Tue, 24 Oct 2017 07:21:15 -0700 (PDT) Received: from localhost.localdomain (d515300d8.static.telenet.be. [81.83.0.216]) by smtp.googlemail.com with ESMTPSA id y1sm267250edl.1.2017.10.24.07.21.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Oct 2017 07:21:14 -0700 (PDT) From: Koen Vandeputte To: lede-dev@lists.infradead.org Date: Tue, 24 Oct 2017 16:20:21 +0200 Message-Id: <1508854822-11341-1-git-send-email-koen.vandeputte@ncentric.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171024_072138_046706_B57B82B0 X-CRM114-Status: UNSURE ( 7.62 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH 1/2] uqmi: also try newer pin verification X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Koen Vandeputte , nbd@nbd.name MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Newer devices tend to only support the newer version of the pin verification command, so also try that one. Fixes PIN issues with modems like the Sierra Wireless MC7455 Signed-off-by: Koen Vandeputte --- Verified using online shell checker package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh index f5c8768..079c229 100755 --- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh +++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh @@ -70,7 +70,7 @@ proto_qmi_setup() { done [ -n "$pincode" ] && { - uqmi -s -d "$device" --verify-pin1 "$pincode" || { + uqmi -s -d "$device" --verify-pin1 "$pincode" || uqmi -s -d "$device" --uim-verify-pin1 "$pincode" || { echo "Unable to verify PIN" proto_notify_error "$interface" PIN_FAILED proto_block_restart "$interface" From patchwork Tue Oct 24 14:20:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koen Vandeputte X-Patchwork-Id: 829916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cm2e47Ky"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ncentric.com header.i=@ncentric.com header.b="x2dDHkT4"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yLwSt27MHz9sBd for ; Wed, 25 Oct 2017 01:22:06 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rLAz4667NGpyG74pjU8/lSgsbM7gmbTVsg9Z5inUjbU=; b=cm2e47KylgH6s1 of8f14miMVcZxzLifUPLGM9l3h8yJnyINSch2K+C+BeKNmeAaoEOITO/6K6tvRyHrB26PT0MTIzfl LNGwb5Hrsn/1J/X7nPCRVv0+wpBb3jV73HBkbhTazEevpReaPCxdVPZmqIgriqKtaYM60vFuRfGaz DZWMPUfh7w8r0Vo5Uq6vhGQt/fZDHCVOMutZYpPQ64admTTM2Vrsy5hFfjZziuQQhcmhRPLooU8nz SLXNZfB/Y6Xkx4pHFvTvOMTLG975ZJyQV7mhs2XuWPQBmTLZrwz4tcjBgG/1lvJXcbG9ZQ4y6Er+d GktyxB24YwpMnVk7AZUQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e705Z-0000xa-2h; Tue, 24 Oct 2017 14:21:53 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e705J-0000j9-Li for lede-dev@lists.infradead.org; Tue, 24 Oct 2017 14:21:39 +0000 Received: by mail-wm0-x242.google.com with SMTP id u138so16056558wmu.5 for ; Tue, 24 Oct 2017 07:21:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ncentric.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Otw/DQub2VeCaLrAOLBxoZDxM6TDNR5B454L7Gu9nOs=; b=x2dDHkT4AIFRuSkOxmTsDWGKLujIisBomaRzgyKv5rOMtvtEwTOfYoo8F7NvpQBbVQ vijD0sx20mqWKZIJdeIslnklJhDlMcmMwzin+C4Obl9umxmy1lSKY9WvGcw1pTqLx8U1 RdeVKIw/rNOeQR176iwf2bzPxjvvzdNP1LhGY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Otw/DQub2VeCaLrAOLBxoZDxM6TDNR5B454L7Gu9nOs=; b=aMNe5s/quWpB+UaJka5ujsRxTI/+82galgYppE4cfnL+aXfLNpgLWPCtTXktX2BAt5 bqvF4PvteuHF/m+ELoF/A7Zne9eiaoLqEqb8KC8v64eMfsgJsdXaUtiKQJdftgsjJWhd g/fQiZtt6lMArz9YFiufpgEFKdpIkkFMQlOdIL87HnhB79rZasNUPquhzPA7uqRLt3AM aFzeuru4RPhC6yaRV9rPxYvMsuKjhm2z5+CGj1bgHB7jHjSSljmfk0hcR9RDAjHnyNkY BWeY+MVFrBfvhQkX2zGrCsUKb8wOiAdYn7iCFRBM6lWKuS/KxavyjcctFfYvG8CBmpXE ngPQ== X-Gm-Message-State: AMCzsaUepOWyj0ohf+J5Pv19cSTyW9AuCx6f5Dqnz5QYdez84hea7u8T NUXPTXPAdIXnmkFmg9eYKNuMVX17X+Y= X-Google-Smtp-Source: ABhQp+SaBS4SH0kMbCu57+qloH0ufip0pJMvZB2pEAhLyvuJlenqKCv8/MJm9d9j6jXPOLfMu34Z3A== X-Received: by 10.80.205.86 with SMTP id d22mr21102771edj.7.1508854876074; Tue, 24 Oct 2017 07:21:16 -0700 (PDT) Received: from localhost.localdomain (d515300d8.static.telenet.be. [81.83.0.216]) by smtp.googlemail.com with ESMTPSA id y1sm267250edl.1.2017.10.24.07.21.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Oct 2017 07:21:15 -0700 (PDT) From: Koen Vandeputte To: lede-dev@lists.infradead.org Date: Tue, 24 Oct 2017 16:20:22 +0200 Message-Id: <1508854822-11341-2-git-send-email-koen.vandeputte@ncentric.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508854822-11341-1-git-send-email-koen.vandeputte@ncentric.com> References: <1508854822-11341-1-git-send-email-koen.vandeputte@ncentric.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171024_072138_049073_B15C912C X-CRM114-Status: UNSURE ( 7.98 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH 2/2] uqmi: replace legacy command invoke with newer type X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Koen Vandeputte , nbd@nbd.name MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Koen Vandeputte --- Verified using online shell checker package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh index 079c229..9c953ea 100755 --- a/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh +++ b/package/network/utils/uqmi/files/lib/netifd/proto/qmi.sh @@ -111,7 +111,7 @@ proto_qmi_setup() { echo "Starting network $interface" - pdptype=`echo "$pdptype" | awk '{print tolower($0)}'` + pdptype=$(echo "$pdptype" | awk '{print tolower($0)}') [ "$pdptype" = "ip" -o "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] || pdptype="ip" if [ "$pdptype" = "ip" ]; then @@ -122,7 +122,7 @@ proto_qmi_setup() { fi [ "$pdptype" = "ip" -o "$pdptype" = "ipv4v6" ] && { - cid_4=`uqmi -s -d "$device" --get-client-id wds` + cid_4=$(uqmi -s -d "$device" --get-client-id wds) [ $? -ne 0 ] && { echo "Unable to obtain client ID" proto_notify_error "$interface" NO_CID @@ -136,14 +136,14 @@ proto_qmi_setup() { --stop-network 0xffffffff \ --autoconnect > /dev/null - pdh_4=`uqmi -s -d "$device" --set-client-id wds,"$cid_4" \ + pdh_4=$(uqmi -s -d "$device" --set-client-id wds,"$cid_4" \ --start-network \ ${apn:+--apn $apn} \ ${profile:+--profile $profile} \ ${auth:+--auth-type $auth} \ ${username:+--username $username} \ ${password:+--password $password} \ - ${autoconnect:+--autoconnect}` + ${autoconnect:+--autoconnect}) [ $? -ne 0 ] && { echo "Unable to connect IPv4" uqmi -s -d "$device" --set-client-id wds,"$cid_4" --release-client-id wds @@ -153,7 +153,7 @@ proto_qmi_setup() { } [ "$pdptype" = "ipv6" -o "$pdptype" = "ipv4v6" ] && { - cid_6=`uqmi -s -d "$device" --get-client-id wds` + cid_6=$(uqmi -s -d "$device" --get-client-id wds) [ $? -ne 0 ] && { echo "Unable to obtain client ID" proto_notify_error "$interface" NO_CID @@ -167,14 +167,14 @@ proto_qmi_setup() { --stop-network 0xffffffff \ --autoconnect > /dev/null - pdh_6=`uqmi -s -d "$device" --set-client-id wds,"$cid_6" \ + pdh_6=$(uqmi -s -d "$device" --set-client-id wds,"$cid_6" \ --start-network \ ${apn:+--apn $apn} \ ${profile:+--profile $profile} \ ${auth:+--auth-type $auth} \ ${username:+--username $username} \ ${password:+--password $password} \ - ${autoconnect:+--autoconnect}` + ${autoconnect:+--autoconnect}) [ $? -ne 0 ] && { echo "Unable to connect IPv6" uqmi -s -d "$device" --set-client-id wds,"$cid_6" --release-client-id wds