X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2FpcapDecoder%2Fmain.cpp;h=cdada35bbab9c6d99e992a982685bb22e2471b53;hb=26ae04c7e1eba19d02823bcc87c0ee9f6ce76186;hp=c8bbea76e49c03b0006a8e350079704475601cca;hpb=db04ba506b776f4fd925df83a3d092687cf674c5;p=anna.git

diff --git a/example/diameter/pcapDecoder/main.cpp b/example/diameter/pcapDecoder/main.cpp
index c8bbea7..cdada35 100644
--- a/example/diameter/pcapDecoder/main.cpp
+++ b/example/diameter/pcapDecoder/main.cpp
@@ -1,39 +1,11 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// http://redmine.teslayout.com/projects/anna-suite
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     *  Neither the name of the copyright holder nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
-
-// Standard
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
+
+
 #include <pcap.h>
 #include <stdlib.h>
 #include <netinet/ip.h>
@@ -46,7 +18,6 @@
 #include <map>
 
 #include <anna/core/DataBlock.hpp>
-#include <anna/core/util/Tokenizer.hpp>
 #include <anna/core/functions.hpp>
 #include <anna/core/tracing/Logger.hpp>
 #include <anna/core/tracing/TraceWriter.hpp>
@@ -208,12 +179,10 @@ struct sniff_tcp {
 u_char *getPayload(const u_char* packet, int packetSize, int &payloadSize,
                    std::string &srcIp, std::string &dstIp, int &fragmentId, bool &dfFlag,
                    bool &mfFlag, int &fragmentOffset) {
-  const struct sniff_ethernet *ethernet; /* The ethernet header */
   const struct sniff_ip *ip; /* The IP header */
   const struct sniff_tcp *tcp; /* The TCP header */
   u_int size_ip;
   u_int size_tcp;
-  ethernet = (struct sniff_ethernet*)(packet);
   ip = (struct sniff_ip*)(packet + SIZE_ETHERNET);
   size_ip = IP_HL(ip) * 4; // 4 bytes per 32 bits word
 
@@ -335,7 +304,7 @@ int main(int argc, char **argv) {
 
   // Command-line parameters:
   std::string inputFile = argv[1];
-  bool isHex = (inputFile.substr(inputFile.find_last_of(".") + 1) == "hex");
+  //bool isHex = (inputFile.substr(inputFile.find_last_of(".") + 1) == "hex");
   std::string outputFile = inputFile; // extension will be added later
   std::string optionals;
   int indx = 2;
@@ -350,8 +319,8 @@ int main(int argc, char **argv) {
 
   // SNIFFING //////////////////////////////////////////////////////////////////////////////////////////////7
   //temporary packet buffers
-  struct pcap_pkthdr header; // The header that pcap gives us
-  const u_char *packet;      // The actual packet
+  //struct pcap_pkthdr header; // The header that pcap gives us
+  //const u_char *packet;      // The actual packet
   //------------------
   //open the pcap file
   pcap_t *handle;