From 5bf62a0c3cc95abe918f3e772bb10e0a90fdce22 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 11 Jul 2006 17:09:38 +0000 Subject: r16943: Add Jim's code. Jeremy. (This used to be commit f131bf8f16fd8b7c49e6065ecbf6f8686b2f4269) --- examples/pcap2nbench/ethernet.cpp | 62 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 examples/pcap2nbench/ethernet.cpp (limited to 'examples/pcap2nbench/ethernet.cpp') diff --git a/examples/pcap2nbench/ethernet.cpp b/examples/pcap2nbench/ethernet.cpp new file mode 100644 index 0000000000..7fd4f1e421 --- /dev/null +++ b/examples/pcap2nbench/ethernet.cpp @@ -0,0 +1,62 @@ +/*\ + * pcap2nbench - Converts libpcap network traces to nbench input + * Copyright (C) 2004 Jim McDonough + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Written by Anthony Liguori +\*/ + +#include + +#include "ethernet.hpp" + +ethernet::ethernet(const uint8_t *data, size_t length) { + if (length < 14) { + std::cerr << "Invalid ethernet packet" << std::endl; + } + memcpy(dst, data, sizeof(dst)); + memcpy(src, data + 6, sizeof(src)); + memcpy(&type, data + 12, sizeof(type)); + type = ntohs(type); +} + +std::ostream &operator<<(std::ostream &lhs, const ethernet &rhs) +{ + lhs << "Destination: "; + for (int i = 0; i < 6; i++) { + char buf[3]; + sprintf(buf, "%.2x", rhs.dst[i]); + if (i) lhs << ":"; + lhs << buf; + } + lhs << std::endl; + + lhs << "Source: "; + for (int i = 0; i < 6; i++) { + char buf[3]; + sprintf(buf, "%.2x", rhs.src[i]); + if (i) lhs << ":"; + lhs << buf; + } + lhs << std::endl; + + lhs << "Type: "; + char buf[7]; + sprintf(buf, "%.4x", rhs.type); + lhs << buf << std::endl; + + return lhs; +} -- cgit From 2a9b4da0fa00d4ada504f49fafcadab7b0094331 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 9 Jul 2007 19:46:27 +0000 Subject: r23780: Find and fix more GPL2 -> GPL3. Jeremy. (This used to be commit c2f7ab1c175ecff0cf44d0bbc4763ba9f7d7803f) --- examples/pcap2nbench/ethernet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/pcap2nbench/ethernet.cpp') diff --git a/examples/pcap2nbench/ethernet.cpp b/examples/pcap2nbench/ethernet.cpp index 7fd4f1e421..2077591ef7 100644 --- a/examples/pcap2nbench/ethernet.cpp +++ b/examples/pcap2nbench/ethernet.cpp @@ -4,7 +4,7 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, -- cgit From 153cfb9c83534b09f15cc16205d7adb19b394928 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 05:23:25 +0000 Subject: r23801: The FSF has moved around a lot. This fixes their Mass Ave address. (This used to be commit 87c91e4362c51819032bfbebbb273c52e203b227) --- examples/pcap2nbench/ethernet.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'examples/pcap2nbench/ethernet.cpp') diff --git a/examples/pcap2nbench/ethernet.cpp b/examples/pcap2nbench/ethernet.cpp index 2077591ef7..4d531594e2 100644 --- a/examples/pcap2nbench/ethernet.cpp +++ b/examples/pcap2nbench/ethernet.cpp @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * along with this program; if not, see . * * Written by Anthony Liguori \*/ -- cgit