Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package netsniff-ng for openSUSE:Factory checked in at 2021-02-03 19:54:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netsniff-ng (Old) and /work/SRC/openSUSE:Factory/.netsniff-ng.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "netsniff-ng" Wed Feb 3 19:54:41 2021 rev:8 rq:866525 version:0.6.8 Changes: -------- --- /work/SRC/openSUSE:Factory/netsniff-ng/netsniff-ng.changes 2020-06-22 17:45:36.709790631 +0200 +++ /work/SRC/openSUSE:Factory/.netsniff-ng.new.28504/netsniff-ng.changes 2021-02-03 19:54:43.137602061 +0100 @@ -1,0 +2,7 @@ +Mon Jan 11 12:05:14 UTC 2021 - Martin Hauke <[email protected]> + +- Update to version 0.6.8 + * Bugfix release + * remove "CFLAGS+=-fcommon" + +------------------------------------------------------------------- Old: ---- netsniff-ng-0.6.7.tar.xz New: ---- netsniff-ng-0.6.8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netsniff-ng.spec ++++++ --- /var/tmp/diff_new_pack.r4Bm4I/_old 2021-02-03 19:54:43.905602985 +0100 +++ /var/tmp/diff_new_pack.r4Bm4I/_new 2021-02-03 19:54:43.909602990 +0100 @@ -1,7 +1,7 @@ # # spec file for package netsniff-ng # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2012 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: netsniff-ng -Version: 0.6.7 +Version: 0.6.8 Release: 0 Summary: Network Sniffer for Packet Inspection License: GPL-2.0-only @@ -73,7 +73,7 @@ export NACL_LIB=sodium export NACL_INC_DIR=/usr/include/sodium ./configure --disable-geoip -make %{?_smp_mflags} ETCDIR=%{_sysconfdir} Q= STRIP=: CFLAGS="%{optflags} -fcommon" +make %{?_smp_mflags} ETCDIR=%{_sysconfdir} Q= STRIP=: CFLAGS="%{optflags}" %install make install PREFIX=%{_prefix} ETCDIR=%{_sysconfdir} DESTDIR=%{buildroot} ++++++ netsniff-ng-0.6.7.tar.xz -> netsniff-ng-0.6.8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/AUTHORS new/netsniff-ng-0.6.8/AUTHORS --- old/netsniff-ng-0.6.7/AUTHORS 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/AUTHORS 2021-01-11 12:47:32.000000000 +0100 @@ -37,6 +37,7 @@ * Quentin Chateau <[email protected]> * Radoslav Bodo <[email protected]> * Reiner Herrmann <[email protected]> + * Rosen Penev <[email protected]> * Stephen Wadeley <[email protected]> * Teguh <[email protected]> * Thomas Fleischmann <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/Makefile new/netsniff-ng-0.6.8/Makefile --- old/netsniff-ng-0.6.7/Makefile 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/Makefile 2021-01-11 12:47:32.000000000 +0100 @@ -15,9 +15,9 @@ VERSION = 0 PATCHLEVEL = 6 -SUBLEVEL = 7 +SUBLEVEL = 8 EXTRAVERSION = -NAME = Polygon Window +NAME = Flutternozzle TOOLS ?= $(CONFIG_TOOLS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/astraceroute.8 new/netsniff-ng-0.6.8/astraceroute.8 --- old/netsniff-ng-0.6.7/astraceroute.8 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/astraceroute.8 2021-01-11 12:47:32.000000000 +0100 @@ -24,9 +24,9 @@ Due to astraceroute's configurability, it is also possible to gather some more useful information about the hop regarding what it does and does not allow to pass through. This is done by using clear text strings for probing DPIs or -``great firewalls'' to determine if they will filter out blacklisted critical -keywords. This tool might be a good start for further in-depth analysis of such -systems. +``great firewalls'' to determine if they will filter out blocked critical +keywords. This tool might be a good start for further in-depth analysis +of such systems. .PP .SH OPTIONS .TP @@ -159,7 +159,7 @@ In this example, we have a Null probe to the remote host netsniff-ng.org, port 80 (default) and this time, we append the cleartext string "censor-me" into the packet payload to test if a firewall or DPI will let this string pass. Such a trace -could be done once without, and once with, a blacklisted string to gather possible +could be done once without and once with a blocked string to gather possible information about censorship. .PP .SH NOTE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/astraceroute.c new/netsniff-ng-0.6.8/astraceroute.c --- old/netsniff-ng-0.6.7/astraceroute.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/astraceroute.c 2021-01-11 12:47:32.000000000 +0100 @@ -51,9 +51,9 @@ char *host, *port, *dev, *payload, *bind_addr; size_t totlen, rcvlen; socklen_t sd_len; - int init_ttl, max_ttl, dns_resolv, queries, timeout; - int syn, ack, ecn, fin, psh, rst, urg, tos, nofrag, proto, show; - int dport, latitude; + int init_ttl, max_ttl, dport, queries, timeout; + int syn, ack, ecn, fin, psh, rst, urg, tos, nofrag, proto; + bool do_geo_lookup, do_dns_resolution, do_show_packet; }; struct proto_ops { @@ -65,8 +65,8 @@ size_t min_len_tcp, min_len_icmp; int (*check)(uint8_t *packet, size_t len, int ttl, int id, const struct sockaddr *src); - void (*handler)(uint8_t *packet, size_t len, int dns_resolv, - int latitude); + void (*handler)(uint8_t *packet, size_t len, bool do_dns_resolution, + bool do_geo_lookup); }; static sig_atomic_t sigint = 0; @@ -76,15 +76,15 @@ const struct sockaddr *src); static int check_ipv4(uint8_t *packet, size_t len, int ttl, int id, const struct sockaddr *ss); -static void handle_ipv4(uint8_t *packet, size_t len, int dns_resolv, - int latitude); +static void handle_ipv4(uint8_t *packet, size_t len, bool do_dns_resolution, + bool do_geo_lookup); static int assemble_ipv6(uint8_t *packet, size_t len, int ttl, int proto, const struct ctx *ctx, const struct sockaddr *dst, const struct sockaddr *src); static int check_ipv6(uint8_t *packet, size_t len, int ttl, int id, const struct sockaddr *ss); -static void handle_ipv6(uint8_t *packet, size_t len, int dns_resolv, - int latitude); +static void handle_ipv6(uint8_t *packet, size_t len, bool do_dns_resolution, + bool do_geo_lookup); static const char *short_options = "H:p:nNf:m:b:i:d:q:x:SAEFPURt:Gl:hv46X:ZuL"; static const struct option long_options[] = { @@ -119,7 +119,8 @@ {NULL, 0, NULL, 0} }; -static const char *copyright = "Please report bugs to <[email protected]>\n" +static const char *copyright = + "Please report bugs at https://github.com/netsniff-ng/netsniff-ng/issues\n"; "Copyright (C) 2011-2013 Daniel Borkmann <[email protected]>\n" "Swiss federal institute of technology (ETH Zurich)\n" "License: GNU GPL version 2.0\n" @@ -513,7 +514,7 @@ } static void handle_ipv4(uint8_t *packet, size_t len __maybe_unused, - int dns_resolv, int latitude) + bool do_dns_resolution, bool do_geo_lookup) { char hbuff[NI_MAXHOST]; struct iphdr *iph = (struct iphdr *) packet; @@ -534,7 +535,7 @@ country = geoip4_country_name(&sd); city = geoip4_city_name(&sd); - if (dns_resolv) { + if (do_dns_resolution) { hent = gethostbyaddr(&sd.sin_addr, sizeof(sd.sin_addr), PF_INET); if (hent) printf(" %s (%s)", hent->h_name, hbuff); @@ -550,7 +551,7 @@ if (city) printf(", %s", city); } - if (latitude) + if (do_geo_lookup) printf(" (%f/%f)", geoip4_latitude(&sd), geoip4_longitude(&sd)); free(city); @@ -583,7 +584,7 @@ } static void handle_ipv6(uint8_t *packet, size_t len __maybe_unused, - int dns_resolv, int latitude) + bool do_dns_resolution, bool do_geo_lookup) { char hbuff[NI_MAXHOST]; struct ip6_hdr *ip6h = (struct ip6_hdr *) packet; @@ -604,7 +605,7 @@ country = geoip6_country_name(&sd); city = geoip6_city_name(&sd); - if (dns_resolv) { + if (do_dns_resolution) { hent = gethostbyaddr(&sd.sin6_addr, sizeof(sd.sin6_addr), PF_INET6); if (hent) printf(" %s (%s)", hent->h_name, hbuff); @@ -620,7 +621,7 @@ if (city) printf(", %s", city); } - if (latitude) + if (do_geo_lookup) printf(" (%f/%f)", geoip6_latitude(&sd), geoip6_longitude(&sd)); free(city); @@ -910,8 +911,8 @@ af_ops[ctx->proto].handler(pkt_rcv + sizeof(struct ethhdr), ret - sizeof(struct ethhdr), - ctx->dns_resolv, ctx->latitude); - if (ctx->show) { + ctx->do_dns_resolution, ctx->do_geo_lookup); + if (ctx->do_show_packet) { struct pkt_buff *pkt; printf("\n"); @@ -951,9 +952,9 @@ if (ret <= 0) printf("\r%2d: ?[ no answer]", ttl); - if (ctx->show == 0) + if (!ctx->do_show_packet) printf("\n"); - if (ctx->show && ret <= 0) + if (ctx->do_show_packet && ret <= 0) printf("\n\n"); fflush(stdout); @@ -983,7 +984,7 @@ ctx->rcvlen = device_mtu(ctx->dev) - sizeof(struct ethhdr); if (ctx->totlen >= ctx->rcvlen) - panic("Packet len exceeds device MTU!\n"); + panic("packet length (%zu) exceeds device MTU (%zu)\n", ctx->totlen, ctx->rcvlen); pkt_snd = xmalloc(ctx->totlen); pkt_rcv = xmalloc(ctx->rcvlen); @@ -1046,7 +1047,7 @@ ctx.port = xstrdup(optarg); break; case 'n': - ctx.dns_resolv = 0; + ctx.do_dns_resolution = false; break; case '4': ctx.proto = IPPROTO_IP; @@ -1055,10 +1056,10 @@ ctx.proto = IPPROTO_IPV6; break; case 'Z': - ctx.show = 1; + ctx.do_show_packet = true; break; case 'N': - ctx.dns_resolv = 1; + ctx.do_dns_resolution = true; break; case 'f': ctx.init_ttl = atoi(optarg); @@ -1089,7 +1090,7 @@ help(); break; case 'L': - ctx.latitude = 1; + ctx.do_geo_lookup = true; break; case 'S': ctx.syn = 1; @@ -1142,11 +1143,11 @@ case 'X': case 't': case 'l': - panic("Option -%c requires an argument!\n", + panic("option -%c requires an argument!\n", optopt); default: if (isprint(optopt)) - printf("Unknown option character `0x%X\'!\n", optopt); + printf("unknown option character '0x%X'!\n", optopt); die(); } default: @@ -1159,9 +1160,9 @@ help(); if (!device_up_and_running(ctx.dev)) - panic("Networking device not up and running!\n"); + panic("networking device %s is not up and running\n", ctx.dev); if (device_mtu(ctx.dev) <= ctx.totlen) - panic("Packet larger than device MTU!\n"); + panic("packet length (%zu) exceeds device MTU (%zu)\n", ctx.totlen, device_mtu(ctx.dev)); register_signal(SIGHUP, signal_handler); register_signal(SIGINT, signal_handler); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/bpfc.c new/netsniff-ng-0.6.8/bpfc.c --- old/netsniff-ng-0.6.7/bpfc.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/bpfc.c 2021-01-11 12:47:32.000000000 +0100 @@ -33,7 +33,8 @@ {NULL, 0, NULL, 0} }; -static const char *copyright = "Please report bugs to <[email protected]>\n" +static const char *copyright = + "Please report bugs at https://github.com/netsniff-ng/netsniff-ng/issues\n"; "Copyright (C) 2011-2013 Daniel Borkmann <[email protected]>,\n" "Swiss federal institute of technology (ETH Zurich)\n" "License: GNU GPL version 2.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/cookie.c new/netsniff-ng-0.6.8/cookie.c --- old/netsniff-ng-0.6.7/cookie.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/cookie.c 2021-01-11 12:47:32.000000000 +0100 @@ -2,6 +2,7 @@ #include <stdio.h> #include <string.h> #include <syslog.h> +#include <sys/types.h> #include "cookie.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/curvetun.c new/netsniff-ng-0.6.8/curvetun.c --- old/netsniff-ng-0.6.7/curvetun.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/curvetun.c 2021-01-11 12:47:32.000000000 +0100 @@ -74,7 +74,7 @@ }; static const char *copyright = - "Please report bugs to <[email protected]>\n" + "Please report bugs at https://github.com/netsniff-ng/netsniff-ng/issues\n"; "Copyright (C) 2011-2013 Daniel Borkmann <[email protected]>,\n" "Swiss federal institute of technology (ETH Zurich)\n" "License: GNU GPL version 2.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/flowtop.c new/netsniff-ng-0.6.8/flowtop.c --- old/netsniff-ng-0.6.7/flowtop.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/flowtop.c 2021-01-11 12:47:32.000000000 +0100 @@ -225,7 +225,8 @@ {NULL, 0, NULL, 0} }; -static const char *copyright = "Please report bugs to <[email protected]>\n" +static const char *copyright = + "Please report bugs at https://github.com/netsniff-ng/netsniff-ng/issues\n"; "Copyright (C) 2011-2013 Daniel Borkmann <[email protected]>\n" "Copyright (C) 2011-2012 Emmanuel Roullit <[email protected]>\n" "Swiss federal institute of technology (ETH Zurich)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/ifpps.c new/netsniff-ng-0.6.8/ifpps.c --- old/netsniff-ng-0.6.7/ifpps.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/ifpps.c 2021-01-11 12:47:32.000000000 +0100 @@ -93,7 +93,8 @@ {NULL, 0, NULL, 0} }; -static const char *copyright = "Please report bugs to <[email protected]>\n" +static const char *copyright = + "Please report bugs at https://github.com/netsniff-ng/netsniff-ng/issues\n"; "Copyright (C) 2009-2013 Daniel Borkmann <[email protected]>\n" "Swiss federal institute of technology (ETH Zurich)\n" "Copyright (C) 2013 Tobias Klauser <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/netsniff-ng.c new/netsniff-ng-0.6.8/netsniff-ng.c --- old/netsniff-ng-0.6.7/netsniff-ng.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/netsniff-ng.c 2021-01-11 12:47:32.000000000 +0100 @@ -121,7 +121,8 @@ {NULL, 0, NULL, 0} }; -static const char *copyright = "Please report bugs to <[email protected]>\n" +static const char *copyright = + "Please report bugs at https://github.com/netsniff-ng/netsniff-ng/issues\n"; "Copyright (C) 2009-2013 Daniel Borkmann <[email protected]>\n" "Copyright (C) 2009-2012 Emmanuel Roullit <[email protected]>\n" "Copyright (C) 2012 Markus Amend <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/cli.c new/netsniff-ng-0.6.8/staging/cli.c --- old/netsniff-ng-0.6.7/staging/cli.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/cli.c 2021-01-11 12:47:32.000000000 +0100 @@ -23,6 +23,19 @@ #include "mops.h" #include "llist.h" +struct cli_def *gcli; + +char mz_username[32]; +char mz_password[32]; +char mz_enable[32]; +char mz_listen_addr[16]; +int mz_port; +struct mops *clipkt; // actual packet used by CLI thread + +int clidev; + +int cli_debug; + void mz_cli_init(void) { amp_head = automops_init(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/cli.h new/netsniff-ng-0.6.8/staging/cli.h --- old/netsniff-ng-0.6.7/staging/cli.h 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/cli.h 2021-01-11 12:47:32.000000000 +0100 @@ -54,19 +54,19 @@ #define MZ_DEFAULT_ENABLE_PASSWORD "mops" #define MZ_DEFAULT_PORT 25542 // Towel day and 42 -struct cli_def *gcli; +extern struct cli_def *gcli; -char mz_username[32]; -char mz_password[32]; -char mz_enable[32]; -char mz_listen_addr[16]; -int mz_port; -struct mops *clipkt; // actual packet used by CLI thread +extern char mz_username[32]; +extern char mz_password[32]; +extern char mz_enable[32]; +extern char mz_listen_addr[16]; +extern int mz_port; +extern struct mops *clipkt; // actual packet used by CLI thread -int clidev; +extern int clidev; // ================================================================= -int cli_debug; +extern int cli_debug; // Flags from 0x0000 to 0xFFFF // cli_debug & 8000 => Developer specific debugs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/dns.c new/netsniff-ng-0.6.8/staging/dns.c --- old/netsniff-ng-0.6.7/staging/dns.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/dns.c 2021-01-11 12:47:32.000000000 +0100 @@ -89,6 +89,8 @@ "| arcount (or arc) ........... Number of RRs in additional records section 0 / 0\n" \ "\n" +static u_int8_t gbuf[MAX_PAYLOAD_SIZE]; // This is only a generic global buffer to handover data more easily +static u_int32_t gbuf_s; int dns_get_query (char* argval); int dns_get_answer (char* argval); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/llist.c new/netsniff-ng-0.6.8/staging/llist.c --- old/netsniff-ng-0.6.7/staging/llist.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/llist.c 2021-01-11 12:47:32.000000000 +0100 @@ -40,6 +40,8 @@ * */ +struct mz_ll *packet_sequences; +struct mz_ll *cli_seq; // currently edited packet sequence used by CLI // Create new list element - may be the first one (list==NULL) // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/llist.h new/netsniff-ng-0.6.8/staging/llist.h --- old/netsniff-ng-0.6.7/staging/llist.h 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/llist.h 2021-01-11 12:47:32.000000000 +0100 @@ -49,8 +49,8 @@ void *data; // points to your data }; -struct mz_ll *packet_sequences; -struct mz_ll *cli_seq; // currently edited packet sequence used by CLI +extern struct mz_ll *packet_sequences; +extern struct mz_ll *cli_seq; // currently edited packet sequence used by CLI // prototypes struct mz_ll * mz_ll_create_new_element(struct mz_ll *list); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/mausezahn.c new/netsniff-ng-0.6.8/staging/mausezahn.c --- old/netsniff-ng-0.6.7/staging/mausezahn.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/mausezahn.c 2021-01-11 12:47:32.000000000 +0100 @@ -32,8 +32,54 @@ #include "die.h" #include "dev.h" +enum operating_modes mode; + +int ipv6_mode; +int quiet; // don't even print 'important standard short messages' +int verbose; // report character +int simulate; // if 1 then don't really send frames + +char path[256]; +char filename[256]; +FILE *fp, *fp2; // global multipurpose file pointer + +long double total_d; +clock_t mz_start, mz_stop; + +int mz_rand; +int bwidth; + +int32_t + jitter[TIME_COUNT_MAX]; + +int + rtp_log, + time0_flag, // If set then time0 has valid data + sqnr0_flag; + +u_int8_t + mz_ssrc[4]; // holds RTP stream identifier for rcv_rtp() + +u_int16_t + sqnr_cur, + sqnr_last, + sqnr_next; + +u_int32_t + gind, // a global index to run through deltaRX, deltaTX, and jitter + gind_max; // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT + +struct tx_struct tx; // NOTE: tx elements are considered as default values for MOPS + +struct device_struct device_list[MZ_MAX_DEVICES]; + +int device_list_entries; + int verbose_level = 0; +char mz_default_config_path[256]; +char mz_default_log_path[256]; + static const char *short_options = "46hqvVSxra:A:b:B:c:d:E:f:F:l:p:P:R:t:T:M:Q:X:"; static void signal_handler(int number) @@ -177,7 +223,7 @@ printf("\nmausezahn %s, Git id: %s\n", VERSION_LONG, GITVERSION); puts("a fast versatile traffic generator\n" "http://www.netsniff-ng.org\n\n"; - "Please report bugs to <[email protected]>\n" + "Please report bugs at https://github.com/netsniff-ng/netsniff-ng/issues\n"; "Copyright (C) 2008-2010 Herbert Haas <[email protected]>,\n" "Copyright (C) 2011 Daniel Borkmann <[email protected]>,\n" "Swiss federal institute of technology (ETH Zurich)\n" @@ -192,9 +238,6 @@ int i; time_t t; - // Determine platform type sizes: - MZ_SIZE_LONG_INT = sizeof(long int); - mz_default_config_path[0] = 0x00; mz_default_log_path[0] = 0x00; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/mops.c new/netsniff-ng-0.6.8/staging/mops.c --- old/netsniff-ng-0.6.7/staging/mops.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/mops.c 2021-01-11 12:47:32.000000000 +0100 @@ -46,8 +46,11 @@ #include "mz.h" #include "mops.h" +unsigned int min_frame_s; +unsigned int max_frame_s; - +struct automops * amp_head; +struct mops *mp_head; // This global will point to the head of the mops list // Creates first element, aka "head" element // This element can also be used! See mops_alloc_packet! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/mops.h new/netsniff-ng-0.6.8/staging/mops.h --- old/netsniff-ng-0.6.7/staging/mops.h 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/mops.h 2021-01-11 12:47:32.000000000 +0100 @@ -114,8 +114,8 @@ // These are initialized with the definitions MIN_MOPS_FRAME_SIZE and // MAX_MOPS_FRAME_SIZE above but can be overridden by the user (without // extending these limits) -unsigned int min_frame_s; -unsigned int max_frame_s; +extern unsigned int min_frame_s; +extern unsigned int max_frame_s; struct mops_counter { @@ -246,7 +246,7 @@ }; -struct automops * amp_head; +extern struct automops * amp_head; struct mops @@ -688,7 +688,7 @@ ///////////////////////////////////////////////////////////////// -struct mops *mp_head; // This global will point to the head of the mops list +extern struct mops *mp_head; // This global will point to the head of the mops list ///////////////////////////////////////////////////////////////// // MOPS Prototypes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/mz.h new/netsniff-ng-0.6.8/staging/mz.h --- old/netsniff-ng-0.6.7/staging/mz.h 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/mz.h 2021-01-11 12:47:32.000000000 +0100 @@ -108,10 +108,8 @@ #define IPADDRSIZE 46 -int MZ_SIZE_LONG_INT; - -char mz_default_config_path[256]; -char mz_default_log_path[256]; +extern char mz_default_config_path[256]; +extern char mz_default_log_path[256]; struct arp_table_struct { @@ -161,9 +159,11 @@ struct pcap *p_arp; // pcap handle struct arp_table_struct *arp_table; // dedicated ARP table int ps; // packet socket -} device_list[MZ_MAX_DEVICES]; +}; -int device_list_entries; +extern struct device_struct device_list[MZ_MAX_DEVICES]; + +extern int device_list_entries; #pragma pack(1) @@ -272,66 +272,49 @@ SYSLOG, LLDP, IGMP -} mode; - - -int ipv6_mode; -int quiet; // don't even print 'important standard short messages' -int verbose; // report character -int simulate; // if 1 then don't really send frames +}; -char path[256]; -char filename[256]; -FILE *fp, *fp2; // global multipurpose file pointer +extern enum operating_modes mode; -long double total_d; -clock_t mz_start, mz_stop; +extern int ipv6_mode; +extern int quiet; // don't even print 'important standard short messages' +extern int verbose; // report character +extern int simulate; // if 1 then don't really send frames + +extern char path[256]; +extern char filename[256]; +extern FILE *fp, *fp2; // global multipurpose file pointer -enum rtp_display_mode { - BAR, NCURSES, TEXT -} rtp_dm; - +extern long double total_d; +extern clock_t mz_start, mz_stop; -int mz_rand; -int bwidth; +extern int mz_rand; +extern int bwidth; struct mz_timestamp { u_int32_t sec; u_int32_t nsec; }; -struct mz_timestamp - tv, - timeTX[TIME_COUNT_MAX], - timeRX[TIME_COUNT_MAX]; - -int32_t - time0, - jitter_rfc, - jitter[TIME_COUNT_MAX]; +extern int32_t + jitter[TIME_COUNT_MAX]; -int +extern int rtp_log, time0_flag, // If set then time0 has valid data sqnr0_flag; -u_int8_t +extern u_int8_t mz_ssrc[4]; // holds RTP stream identifier for rcv_rtp() -u_int16_t +extern u_int16_t sqnr_cur, sqnr_last, sqnr_next; -u_int32_t - drop, // packet drop count - dis, // packet disorder count +extern u_int32_t gind, // a global index to run through deltaRX, deltaTX, and jitter - gind_max, // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT - gtotal; // counts number of file write cycles (see "got_rtp_packet()") - - -char rtp_filter_str[64]; + gind_max; // the amount of entries used in the (ugly oversized) arrays; per default set to TIME_COUNT struct tx_struct { @@ -496,15 +479,9 @@ rtp_sqnr, rtp_stmp; -} tx; // NOTE: tx elements are considered as default values for MOPS - - - - - -u_int8_t gbuf[MAX_PAYLOAD_SIZE]; // This is only a generic global buffer to handover data more easily -u_int32_t gbuf_s; // +}; +extern struct tx_struct tx; // NOTE: tx elements are considered as default values for MOPS // ************************************ // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/rcv_rtp.c new/netsniff-ng-0.6.8/staging/rcv_rtp.c --- old/netsniff-ng-0.6.7/staging/rcv_rtp.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/rcv_rtp.c 2021-01-11 12:47:32.000000000 +0100 @@ -39,6 +39,25 @@ #include "mz.h" #include "mops.h" +static enum rtp_display_mode { + BAR, NCURSES, TEXT +} rtp_dm; + +static int32_t + time0, + jitter_rfc; + +static struct mz_timestamp + timeTX[TIME_COUNT_MAX], + timeRX[TIME_COUNT_MAX]; + +static u_int32_t + drop, // packet drop count + dis, // packet disorder count + gtotal; // counts number of file write cycles (see "got_rtp_packet()") + +static char rtp_filter_str[64]; + // Initialize the rcv_rtp process: Read user parameters and initialize globals int rcv_rtp_init(void) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/staging/rtp.c new/netsniff-ng-0.6.8/staging/rtp.c --- old/netsniff-ng-0.6.7/staging/rtp.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/staging/rtp.c 2021-01-11 12:47:32.000000000 +0100 @@ -56,7 +56,6 @@ "|\n" - int create_rtp_packet(void) { u_int8_t byte1, byte2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/netsniff-ng-0.6.7/trafgen.c new/netsniff-ng-0.6.8/trafgen.c --- old/netsniff-ng-0.6.7/trafgen.c 2020-05-04 15:15:32.000000000 +0200 +++ new/netsniff-ng-0.6.8/trafgen.c 2021-01-11 12:47:32.000000000 +0100 @@ -140,7 +140,8 @@ {NULL, 0, NULL, 0} }; -static const char *copyright = "Please report bugs to <[email protected]>\n" +static const char *copyright = + "Please report bugs at https://github.com/netsniff-ng/netsniff-ng/issues\n"; "Copyright (C) 2011-2013 Daniel Borkmann <[email protected]>,\n" "Swiss federal institute of technology (ETH Zurich)\n" "License: GNU GPL version 2.0\n" @@ -928,9 +929,7 @@ static void pcap_load_packets(struct dev_io *dev) { - struct packet *pkt; - - while ((pkt = dev_io_read(dev)) != 0) + while (dev_io_read(dev)) /* nothing to do */; }
