NEW FILE HEADER / COPYRIGHT FORMAT

[senf.git] / Examples / DVBAdapter / ULEdec.cc

diff --git a/Examples/DVBAdapter/ULEdec.cc b/Examples/DVBAdapter/ULEdec.cc
index edce523..95a83a6 100644 (file)
--- a/Examples/DVBAdapter/ULEdec.cc
+++ b/Examples/DVBAdapter/ULEdec.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
-// Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+//     Thorsten Horstmann <tho@berlios.de>
 //
 // 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
@@ -25,11 +25,16 @@
 #include "ULEdec.hh"
 
 #include <linux/dvb/dmx.h> 
-#include "Packets/PacketData.hh"
-#include "Utils/hexdump.hh"
-#include "Utils/membind.hh"
+#include <boost/format.hpp>
+#include <senf/Packets.hh>
+#include <senf/Utils/hexdump.hh>
+#include <senf/Utils/membind.hh>
 
 #define PID 271
+#define TRANSPORT_PACKET_SIZE 188
+// max. payload_pointer = ts packet payload size ( = ts packet size - ts header - payload_pointer)
+//                          - 2 bytes min. sndu header
+#define MAX_PAYLOAD_POINTER ( TRANSPORT_PACKET_SIZE - 4 - 1 - 2 )   
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
@@ -54,7 +59,7 @@ ULEdec::ULEdec(unsigned short adapter, unsigned short device)
     this->priv_sndu_type_1 = false;
 }
 
-void ULEdec::handleEvent(senf::FileHandle, senf::Scheduler::EventId event)
+void ULEdec::handleEvent(senf::Scheduler::EventId event)
 {
     senf::TransportPacket ts_packet (
             senf::TransportPacket::create(188, senf::TransportPacket::noinit));
@@ -108,7 +113,7 @@ void ULEdec::handleTSPacket(senf::TransportPacket ts_packet)
                     return;
                 default:
                     if ( (*payload_iter++ << 8 | *payload_iter++) != ULE_END_INDICATOR )
-                        std::cerr << "delimiting error 1\n";
+                        std::cerr << "delimiting error\n";
             } else {
                 BOOST_ASSERT( std::distance( payload_iter, payload_end ) == 0 );
             }
@@ -118,8 +123,9 @@ void ULEdec::handleTSPacket(senf::TransportPacket ts_packet)
     case 1: {
         // a PUSI value of 1 indicates the presence of a Payload Pointer.
         unsigned char payload_pointer = *payload_iter++;
-        if (payload_pointer > 181) {
-            std::cerr << "invalid payload_pointer\n";
+        if (payload_pointer > MAX_PAYLOAD_POINTER) {
+            std::cerr << str( boost::format( 
+                    "invalid payload_pointer (%d)\n") % unsigned(payload_pointer) ) ;
             this->receiver_state = Idle;
             return;
         }
@@ -131,7 +137,9 @@ void ULEdec::handleTSPacket(senf::TransportPacket ts_packet)
             // Reassembly Payload Pointer Checking
             if (snduPacketBytesLeft() != payload_pointer) {
                 // delimiting error
-                std::cerr << "delimiting error 2\n";
+                std::cerr << str( boost::format(
+                        "delimiting error: bytes left in SNDU packet != payload_pointer ("
+                        "(%d != %d)\n") % snduPacketBytesLeft() % payload_pointer );
                 std::advance(payload_iter, payload_pointer);
             } else {
                 payload_iter = readContSNDUPacket( payload_iter, payload_end );
@@ -185,10 +193,15 @@ ULEdec::iterator ULEdec::readNewSNDUPacket(iterator i, iterator const i_end)
         dbit = true;
     }
     if (sndu_length < 5 || sndu_length == 0xffff) {
-        throw ULEdecException("SNDU length error");
+        throw ULEdecException( str( boost::format(
+                "SNDU length error. length=%d") % sndu_length) );
      }
     this->snduPacket = senf::SNDUPacket::create(sndu_length+4);
-    this->snduPacket->d_bit() = dbit;
+
+    if (dbit)
+        this->snduPacket->withoutDestination();
+    // else not needed since default on newly created packet is withDestination()
+
     this->snduPacket->length() = sndu_length;
     this->snduPacketData_iter = boost::next(this->snduPacket.data().begin(), 2);
     this->priv_sndu_type_1 = false;
@@ -227,7 +240,9 @@ void ULEdec::handleSNDUPacket()
     this->snduPacket.dump(std::cout);
     std::cout << "----------------------------------------------------------------------------\n\n";
     if (this->snduPacket->crc() != this->snduPacket->calcCrc()) {
-        throw ULEdecException("CRC Error");
+        throw ULEdecException( str( boost::format( 
+                "CRC Error. received crc:%d calculated crc:%d")
+                    % this->snduPacket->crc() % this->snduPacket->calcCrc() ) );
     }
 //    senf::Packet nextPacket = this->snduPacket.next();
 //    senf::hexdump(
@@ -272,6 +287,6 @@ int main(int argc, char const * argv[])
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
-// compile-command: "scons -u test"
+// compile-command: "scons -U"
 // comment-column: 40
 // End: