From patchwork Tue Jul 24 12:41:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 2220 Return-Path: Received: from nm15.bullet.mail.ukl.yahoo.com (nm15.bullet.mail.ukl.yahoo.com [217.146.183.189]) by open-mesh.org (Postfix) with SMTP id D52FD600407 for ; Tue, 24 Jul 2012 14:41:50 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass reason="1024-bit key; insecure key" header.i=@yahoo.de header.b=cmrKTQLB; dkim-adsp=pass; dkim-atps=neutral Received: from [217.146.183.184] by nm15.bullet.mail.ukl.yahoo.com with NNFMP; 24 Jul 2012 12:41:50 -0000 Received: from [217.146.183.125] by tm15.bullet.mail.ukl.yahoo.com with NNFMP; 24 Jul 2012 12:41:50 -0000 Received: from [127.0.0.1] by smtp102.mail.ukl.yahoo.com with NNFMP; 24 Jul 2012 12:41:50 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1343133710; bh=MQtAIdnhpVE9DHYdfswMGCHZavcxJaSCC2mUGWqFZKE=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer; b=cmrKTQLBhdy4jut6lyFTieyY8fieawFxhkyc+Kt4DGFPZ+IfamPuC9v/VZkeGFJhxF3it+CWmu4MlIUjDvRWZ6AqGhXAcHm4/2d92e3s58hosiQB/Ry8RPhE6Z//moY418v2euq51PhL+jcbgfQkpYBINyEmBi5VELnTQA/ng78= X-Yahoo-Newman-Id: 350858.56955.bm@smtp102.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: LxMBSdoVM1nuVr0G4eqTBpHiS1YkMuR576wDlnvhT4S0M4z G0MqhlHs2QMbmqYX84Q6px1yhS4PFrUp3yZxRlSU.qijXhx_PUqelMVi8yN6 DP_rlvabvWsT7jBdkLmxA4Gt3w68UWNpjbQnlEHU6BfjSuWI47XAPeOcZCwc b8OAQlrUcfu5SXAu1TyfXNqbbBSY3b3POo_QEMp9o6iv1IcjfZWvg6r1ygZv expIWg49Vqyx3GmEZtqTeGpIvpjR.IZFIf4bQJni6t.LxrA0szYxqWm3qu9v n6mO4ns1lwp6PSgzAuPjL2HGmi2XGXI9VH4kf2q.xZd_kexde9D21dJ77XlZ ZDhZazGUsti4Z2RyhHXQeXlxgLjS7usypPFGMOBLkTVhd3c5636Bk5oVcJm5 AZcNoWKxU8Nl5f81pTT4LvTzaOEUDodxtNnc- X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@217.85.84.240 with plain) by smtp102.mail.ukl.yahoo.com with SMTP; 24 Jul 2012 05:41:48 -0700 PDT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Tue, 24 Jul 2012 14:41:36 +0200 Message-Id: <1343133696-4981-1-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.9.1 Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH] batctl: tcpdump - print all warnings and errors on stderr X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jul 2012 12:41:52 -0000 Signed-off-by: Marek Lindner --- tcpdump.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index beac2ac..1a4a9a0 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -46,7 +46,7 @@ #define LEN_CHECK(buff_len, check_len, desc) \ if ((size_t)(buff_len) < (check_len)) { \ - printf("Warning - dropping received %s packet as it is smaller than expected (%zu): %zu\n", \ + fprintf(stderr, "Warning - dropping received %s packet as it is smaller than expected (%zu): %zu\n", \ desc, (check_len), (size_t)(buff_len)); \ return; \ } @@ -586,7 +586,7 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read break; case BATADV_VIS: if (dump_level & DUMP_TYPE_BATVIS) - printf("Warning - batman vis packet received: function not implemented yet\n"); + fprintf(stderr, "Warning - batman vis packet received: function not implemented yet\n"); break; case BATADV_UNICAST_FRAG: if (dump_level & DUMP_TYPE_BATFRAG) @@ -601,14 +601,14 @@ static void parse_eth_hdr(unsigned char *packet_buff, ssize_t buff_len, int read dump_batman_roam(packet_buff, buff_len, read_opt, time_printed); break; default: - printf("Warning - packet contains unknown batman packet type: 0x%02x\n", batman_ogm_packet->header.packet_type); + fprintf(stderr, "Warning - packet contains unknown batman packet type: 0x%02x\n", batman_ogm_packet->header.packet_type); break; } break; default: - printf("Warning - packet contains unknown ether type: 0x%04x\n", ntohs(eth_hdr->ether_type)); + fprintf(stderr, "Warning - packet contains unknown ether type: 0x%04x\n", ntohs(eth_hdr->ether_type)); break; } } @@ -747,7 +747,7 @@ int tcpdump(int argc, char **argv) } if (argc <= found_args) { - printf("Error - target interface not specified\n"); + fprintf(stderr, "Error - target interface not specified\n"); tcpdump_usage(); return EXIT_FAILURE; } @@ -767,14 +767,14 @@ int tcpdump(int argc, char **argv) dump_if->dev = argv[found_args]; if (strlen(dump_if->dev) > IFNAMSIZ - 1) { - printf("Error - interface name too long: %s\n", dump_if->dev); + fprintf(stderr, "Error - interface name too long: %s\n", dump_if->dev); goto out; } dump_if->raw_sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); if (dump_if->raw_sock < 0) { - printf("Error - can't create raw socket: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't create raw socket: %s\n", strerror(errno)); goto out; } @@ -783,7 +783,7 @@ int tcpdump(int argc, char **argv) res = ioctl(dump_if->raw_sock, SIOCGIFHWADDR, &req); if (res < 0) { - printf("Error - can't create raw socket (SIOCGIFHWADDR): %s\n", strerror(errno)); + fprintf(stderr, "Error - can't create raw socket (SIOCGIFHWADDR): %s\n", strerror(errno)); close(dump_if->raw_sock); goto out; } @@ -796,7 +796,7 @@ int tcpdump(int argc, char **argv) case ARPHRD_IEEE80211_RADIOTAP: break; default: - printf("Error - interface '%s' is of unknown type: %i\n", dump_if->dev, dump_if->hw_type); + fprintf(stderr, "Error - interface '%s' is of unknown type: %i\n", dump_if->dev, dump_if->hw_type); goto out; } @@ -806,7 +806,7 @@ int tcpdump(int argc, char **argv) res = ioctl(dump_if->raw_sock, SIOCGIFINDEX, &req); if (res < 0) { - printf("Error - can't create raw socket (SIOCGIFINDEX): %s\n", strerror(errno)); + fprintf(stderr, "Error - can't create raw socket (SIOCGIFINDEX): %s\n", strerror(errno)); close(dump_if->raw_sock); goto out; } @@ -818,7 +818,7 @@ int tcpdump(int argc, char **argv) res = bind(dump_if->raw_sock, (struct sockaddr *)&dump_if->addr, sizeof(struct sockaddr_ll)); if (res < 0) { - printf("Error - can't bind raw socket: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't bind raw socket: %s\n", strerror(errno)); close(dump_if->raw_sock); goto out; } @@ -844,7 +844,7 @@ int tcpdump(int argc, char **argv) continue; if (res < 0) { - printf("Error - can't select on raw socket: %s\n", strerror(errno)); + fprintf(stderr, "Error - can't select on raw socket: %s\n", strerror(errno)); continue; } @@ -855,12 +855,12 @@ int tcpdump(int argc, char **argv) read_len = read(dump_if->raw_sock, packet_buff, sizeof(packet_buff)); if (read_len < 0) { - printf("Error - can't read from interface '%s': %s\n", dump_if->dev, strerror(errno)); + fprintf(stderr, "Error - can't read from interface '%s': %s\n", dump_if->dev, strerror(errno)); continue; } if ((size_t)read_len < sizeof(struct ether_header)) { - printf("Warning - dropping received packet as it is smaller than expected (%zu): %zd\n", + fprintf(stderr, "Warning - dropping received packet as it is smaller than expected (%zu): %zd\n", sizeof(struct ether_header), read_len); continue; }