From patchwork Fri Jun 23 17:18:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 780183 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wvQCg3Zgbz9t0j for ; Sat, 24 Jun 2017 03:18:55 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wvQCg0W0MzDqjQ for ; Sat, 24 Jun 2017 03:18:55 +1000 (AEST) X-Original-To: slof@lists.ozlabs.org Delivered-To: slof@lists.ozlabs.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wvQCQ50s3zDqjL for ; Sat, 24 Jun 2017 03:18:42 +1000 (AEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E893E7C832; Fri, 23 Jun 2017 17:18:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E893E7C832 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E893E7C832 Received: from thh440s.redhat.com (ovpn-116-135.ams2.redhat.com [10.36.116.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1293D77EC7; Fri, 23 Jun 2017 17:18:39 +0000 (UTC) From: Thomas Huth To: slof@lists.ozlabs.org Date: Fri, 23 Jun 2017 19:18:35 +0200 Message-Id: <1498238315-17909-4-git-send-email-thuth@redhat.com> In-Reply-To: <1498238315-17909-1-git-send-email-thuth@redhat.com> References: <1498238315-17909-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 23 Jun 2017 17:18:41 +0000 (UTC) Subject: [SLOF] [PATCH 3/3] libnet: Refactor some code of netload() into a separate function X-BeenThere: slof@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Patches for https://github.com/aik/SLOF" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: slof-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "SLOF" netload() is a huge function, it's easy to lose track here. So let's refactor the TFTP-related loading and error printing code into a separate function instead. Signed-off-by: Thomas Huth --- lib/libnet/netload.c | 177 +++++++++++++++++++++++++++------------------------ 1 file changed, 94 insertions(+), 83 deletions(-) diff --git a/lib/libnet/netload.c b/lib/libnet/netload.c index 8afe341..39daabd 100644 --- a/lib/libnet/netload.c +++ b/lib/libnet/netload.c @@ -403,6 +403,95 @@ static void seed_rng(uint8_t mac[]) srand(seed); } +static int tftp_load(filename_ip_t *fnip, unsigned char *buffer, int len, + unsigned int retries, tftp_err_t *tftp_err, int32_t mode, + int32_t blksize, int ip_vers) +{ + int rc; + + rc = tftp(fnip, buffer, len, retries, tftp_err, mode, blksize, ip_vers); + + if (rc > 0) { + printf(" TFTP: Received %s (%d KBytes)\n", fnip->filename, + rc / 1024); + } else if (rc == -1) { + netload_error(0x3003, "unknown TFTP error"); + return -103; + } else if (rc == -2) { + netload_error(0x3004, "TFTP buffer of %d bytes " + "is too small for %s", + len, fnip->filename); + return -104; + } else if (rc == -3) { + netload_error(0x3009, "file not found: %s", + fnip->filename); + return -108; + } else if (rc == -4) { + netload_error(0x3010, "TFTP access violation"); + return -109; + } else if (rc == -5) { + netload_error(0x3011, "illegal TFTP operation"); + return -110; + } else if (rc == -6) { + netload_error(0x3012, "unknown TFTP transfer ID"); + return -111; + } else if (rc == -7) { + netload_error(0x3013, "no such TFTP user"); + return -112; + } else if (rc == -8) { + netload_error(0x3017, "TFTP blocksize negotiation failed"); + return -116; + } else if (rc == -9) { + netload_error(0x3018, "file exceeds maximum TFTP transfer size"); + return -117; + } else if (rc <= -10 && rc >= -15) { + char *icmp_err_str; + switch (rc) { + case -ICMP_NET_UNREACHABLE - 10: + icmp_err_str = "net unreachable"; + break; + case -ICMP_HOST_UNREACHABLE - 10: + icmp_err_str = "host unreachable"; + break; + case -ICMP_PROTOCOL_UNREACHABLE - 10: + icmp_err_str = "protocol unreachable"; + break; + case -ICMP_PORT_UNREACHABLE - 10: + icmp_err_str = "port unreachable"; + break; + case -ICMP_FRAGMENTATION_NEEDED - 10: + icmp_err_str = "fragmentation needed and DF set"; + break; + case -ICMP_SOURCE_ROUTE_FAILED - 10: + icmp_err_str = "source route failed"; + break; + default: + icmp_err_str = " UNKNOWN"; + break; + } + netload_error(0x3005, "ICMP ERROR \"%s\"", icmp_err_str); + return -105; + } else if (rc == -40) { + netload_error(0x3014, "TFTP error occurred after " + "%d bad packets received", + tftp_err->bad_tftp_packets); + return -113; + } else if (rc == -41) { + netload_error(0x3015, "TFTP error occurred after " + "missing %d responses", + tftp_err->no_packets); + return -114; + } else if (rc == -42) { + netload_error(0x3016, "TFTP error missing block %d, " + "expected block was %d", + tftp_err->blocks_missed, + tftp_err->blocks_received); + return -115; + } + + return rc; +} + int netload(char *buffer, int len, char *ret_buffer, int huge_load, int block_size, char *args_fs, int alen) { @@ -633,94 +722,16 @@ int netload(char *buffer, int len, char *ret_buffer, int huge_load, printf("%s\n", ip6_str); } - // accept at most 20 bad packets - // wait at most for 40 packets - rc = tftp(&fn_ip, (unsigned char *) buffer, - len, obp_tftp_args.tftp_retries, - &tftp_err, huge_load, block_size, ip_version); + /* Do the TFTP load and print error message if necessary */ + rc = tftp_load(&fn_ip, (unsigned char *)buffer, len, + obp_tftp_args.tftp_retries, &tftp_err, huge_load, + block_size, ip_version); - if(obp_tftp_args.ip_init == IP_INIT_DHCP) + if (obp_tftp_args.ip_init == IP_INIT_DHCP) dhcp_send_release(fn_ip.fd); close(fn_ip.fd); - if (rc > 0) { - printf(" TFTP: Received %s (%d KBytes)\n", fn_ip.filename, - rc / 1024); - } else if (rc == -1) { - netload_error(0x3003, "unknown TFTP error"); - return -103; - } else if (rc == -2) { - netload_error(0x3004, "TFTP buffer of %d bytes " - "is too small for %s", - len, fn_ip.filename); - return -104; - } else if (rc == -3) { - netload_error(0x3009, "file not found: %s", - fn_ip.filename); - return -108; - } else if (rc == -4) { - netload_error(0x3010, "TFTP access violation"); - return -109; - } else if (rc == -5) { - netload_error(0x3011, "illegal TFTP operation"); - return -110; - } else if (rc == -6) { - netload_error(0x3012, "unknown TFTP transfer ID"); - return -111; - } else if (rc == -7) { - netload_error(0x3013, "no such TFTP user"); - return -112; - } else if (rc == -8) { - netload_error(0x3017, "TFTP blocksize negotiation failed"); - return -116; - } else if (rc == -9) { - netload_error(0x3018, "file exceeds maximum TFTP transfer size"); - return -117; - } else if (rc <= -10 && rc >= -15) { - char *icmp_err_str; - switch (rc) { - case -ICMP_NET_UNREACHABLE - 10: - icmp_err_str = "net unreachable"; - break; - case -ICMP_HOST_UNREACHABLE - 10: - icmp_err_str = "host unreachable"; - break; - case -ICMP_PROTOCOL_UNREACHABLE - 10: - icmp_err_str = "protocol unreachable"; - break; - case -ICMP_PORT_UNREACHABLE - 10: - icmp_err_str = "port unreachable"; - break; - case -ICMP_FRAGMENTATION_NEEDED - 10: - icmp_err_str = "fragmentation needed and DF set"; - break; - case -ICMP_SOURCE_ROUTE_FAILED - 10: - icmp_err_str = "source route failed"; - break; - default: - icmp_err_str = " UNKNOWN"; - break; - } - netload_error(0x3005, "ICMP ERROR \"%s\"", icmp_err_str); - return -105; - } else if (rc == -40) { - netload_error(0x3014, "TFTP error occurred after " - "%d bad packets received", - tftp_err.bad_tftp_packets); - return -113; - } else if (rc == -41) { - netload_error(0x3015, "TFTP error occurred after " - "missing %d responses", - tftp_err.no_packets); - return -114; - } else if (rc == -42) { - netload_error(0x3016, "TFTP error missing block %d, " - "expected block was %d", - tftp_err.blocks_missed, - tftp_err.blocks_received); - return -115; - } return rc; }