//
// Copyright (C) 2007
// Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-// David Wagner <dw6@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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+// http://senf.berlios.de/license.html
//
-// 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.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on,
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
//
-// 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.,
-// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V.
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+// David Wagner <dw6@berlios.de>
/** \file
\brief DTCPPacket non-inline non-template implementation */
-//#include "DTCPPacket.hh"
+#include "DTCPPacket.hh"
//#include "DTCPPacket.ih"
// Custom includes
-#include "DTCPPacket.hh"
#include <boost/io/ios_state.hpp>
#include <iomanip>
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
prefix_ void senf::DTCPHelloPacketType::dump(packet p, std::ostream & os)
{
"8", "9", "10", "11", "12", "13", "14", "15" };
boost::io::ios_all_saver ias(os);
os << "DTCP HELLO Packet:" << std::endl
- << " version : " << p->versionNumber() << std::endl
- << " command : " << COMMANDS[p->command()] << std::endl
- << " interval : " << unsigned(p->interval()) << std::endl
- << " sequence number : " << p->sequenceNumber() << std::endl
- << " receive capable feed : " << (p->receiveCapableFeed() ? "yes" : "no") << std::endl
- << " ip version : " << p->ipVersion() << std::endl
- << " tunnel protocol : " << unsigned(p->tunnelProtocol()) << std::endl
- << " number of BDL ips : " << unsigned(p->fbipCount()) << std::endl
- << " feed BDL ips : ";
-
+ << senf::fieldName("version") << p->versionNumber() << "\n"
+ << senf::fieldName("command") << COMMANDS[p->command()] << "\n"
+ << senf::fieldName("interval") << unsigned(p->interval()) << "\n"
+ << senf::fieldName("sequence number") << p->sequenceNumber() << "\n"
+ << senf::fieldName("receive capable feed") << (p->receiveCapableFeed() ? "yes" : "no") << "\n"
+ << senf::fieldName("ip version") << p->ipVersion() << "\n"
+ << senf::fieldName("tunnel protocol") << unsigned(p->tunnelProtocol()) << "\n"
+ << senf::fieldName("number of BDL ips") << unsigned(p->fbipCount()) << "\n"
+ << " feed BDL ips:\n";
+
switch (p->ipVersion()) {
case 4 : {
typedef DTCPHelloPacket::Parser::v4fbipList_t FBIPList;
FBIPList::container::iterator i (fbips.begin());
FBIPList::container::iterator const i_end (fbips.end());
for (; i != i_end; ++i)
- os << "\n " << *i;
+ os << " " << *i << "\n";
break;
}
case 6 : {
FBIPList::container::iterator i (fbips.begin());
FBIPList::container::iterator const i_end (fbips.end());
for (; i != i_end; ++i)
- os << "\n " << *i;
+ os << " " << *i << "\n";
break;
}
default:
- os << "unknown ip version";
+ os << " unknown ip version\n";
}
-
- os << std::endl;
}
#undef prefix_
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f