From patchwork Thu Feb 28 18:06:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Haley X-Patchwork-Id: 1049671 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KfADgPUg"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 449LQw1rh2z9s2R for ; Fri, 1 Mar 2019 05:18:47 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 6F6E5AD76; Thu, 28 Feb 2019 18:18:42 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 96DCDAD52 for ; Thu, 28 Feb 2019 18:06:53 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 32B8976D for ; Thu, 28 Feb 2019 18:06:53 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id c2so11918749qkb.3 for ; Thu, 28 Feb 2019 10:06:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=wW3wHLcMOuvHAdG4RSreHNUKk5qsAQTFcNFNGvEyOqo=; b=KfADgPUgcM2KciPr+Q+pgSKXb/upAWxI8syly+vhh1iVNEwhI+5ncWz5J2wySLWWJc Nq0hKSc7keiERw5wiNovhzSmNPOmMuuDTC6z3+E8vUdZ4Mbv0TYsANwTnuvWc1P65eM1 xj/DynlotBdwWlQBJnj3au7RZTpRqTc8DKWf/mtlO1srzIh+rN0g501RKSaUxleCPg7e 31yngMVe7Y1V6WLHvl1at/aP6XbX/1bTf+mXtr106gpMr3ys3fIqK1hcANsOziizHCoS +VK82yj+sGFWkob6iSwLkgt6+EJXuiK8eOlZPP6wznU3UgNm7mkCyvjSyhRjmH+2QnTL E3zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=wW3wHLcMOuvHAdG4RSreHNUKk5qsAQTFcNFNGvEyOqo=; b=HAIM4/WS3a2m8hXKC6e377PR3WajIqzqCBMSYm596Q16BeN0CS2mx0Q+0KjpecHjk9 NSofn3iNyZMJxSubFYK56F5AusXTQ2K7LcrbunE1vH1V0eH2f3N74GKSu0S2hRw/aR/1 VmNPvxA3fvDhLF2pdEqSL7pplG59Sx4/LyWOg5Lc4xHrlMAcitykl/Z1nDVoAqshJ/QR URWCKZ4q8jU1OZQUK/iL+NRZEXhtJFgZFdae9NPjkWywiFrEkBLDepz/HcolLFiicc6Y yqeaXHgZbcF4vMJ8yTUyTlZKekgE1PD3yx/jsrUXVTm/rKlksCD0Kjdjw/YVnjCHuV/t w6fQ== X-Gm-Message-State: APjAAAX+qVbKnTuSmVIuD8ZA9MdGOfX3p6HuGj/tQUqBYyLF6NWLG06O FIK58+w8EZ0v0RTfMjwg/o5I5gjAVQ8= X-Google-Smtp-Source: APXvYqxbsbQ3wMo4N8kWXjmhyjHyqEWisGy+QIpgozD62OV3EdCRGiUJNcQ1ChmJyq46hnRCr6yi8w== X-Received: by 2002:a37:50d5:: with SMTP id e204mr661444qkb.26.1551377212264; Thu, 28 Feb 2019 10:06:52 -0800 (PST) Received: from spaceshipone.redhat.com ([2601:18f:700:c12d:691f:7187:d7df:3dc1]) by smtp.gmail.com with ESMTPSA id t26sm13741867qkl.73.2019.02.28.10.06.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 10:06:51 -0800 (PST) From: Brian Haley To: dev@openvswitch.org Date: Thu, 28 Feb 2019 13:06:50 -0500 Message-Id: <20190228180650.31470-1-haleyb.dev@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] ovn: Make DHCP log messages unique X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Brian Haley Two messags were using the same string, add info to one to make it unique. Also cleaned-up some of the others to make them consistent throughout. Signed-off-by: Brian Haley --- ovn/controller/pinctrl.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c index 9250a71bd..655a85f74 100644 --- a/ovn/controller/pinctrl.c +++ b/ovn/controller/pinctrl.c @@ -622,12 +622,13 @@ pinctrl_handle_put_dhcp_opts( in_dhcp_ptr += sizeof *in_dhcp_data; if (in_dhcp_ptr > end) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "Invalid or incomplete DHCP packet received"); + VLOG_WARN_RL(&rl, "Invalid or incomplete DHCP packet received, " + "bad data length"); goto exit; } if (in_dhcp_data->op != DHCP_OP_REQUEST) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "Invalid opcode in the DHCP packet : %d", + VLOG_WARN_RL(&rl, "Invalid opcode in the DHCP packet: %d", in_dhcp_data->op); goto exit; } @@ -692,7 +693,7 @@ pinctrl_handle_put_dhcp_opts( if (*in_dhcp_msg_type != DHCP_MSG_DISCOVER && *in_dhcp_msg_type != DHCP_MSG_REQUEST) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "Invalid DHCP message type : %d", *in_dhcp_msg_type); + VLOG_WARN_RL(&rl, "Invalid DHCP message type: %d", *in_dhcp_msg_type); goto exit; } @@ -1024,13 +1025,13 @@ pinctrl_handle_put_dhcpv6_opts( if (!in_opt_client_id) { VLOG_WARN_RL(&rl, "DHCPv6 option - Client id not present in the " - " DHCPv6 packet"); + "DHCPv6 packet"); goto exit; } if (!iaid && in_dhcpv6_msg_type != DHCPV6_MSG_TYPE_INFO_REQ) { VLOG_WARN_RL(&rl, "DHCPv6 option - IA NA not present in the " - " DHCPv6 packet"); + "DHCPv6 packet"); goto exit; } @@ -2391,8 +2392,8 @@ extract_addresses_with_port(const char *addresses, if (lexer.token.type != LEX_T_STRING) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); VLOG_INFO_RL(&rl, - "Syntax error: expecting quoted string after" - " 'is_chassis_resident' in address '%s'", addresses); + "Syntax error: expecting quoted string after " + "'is_chassis_resident' in address '%s'", addresses); lexer_destroy(&lexer); return false; }