X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FsyncRouteCommand.h;h=0d66ef395e7c4693c033e290ed80c69ad9aa1167;hb=bd02a5f6be4815d46524d613f727199ca756c971;hp=5bef2f90cc6b9ba6ed7bd3393d199c87f9c81b06;hpb=058ae090a970436caec3b3059e9e18b310dd6b0d;p=anytun.git diff --git a/src/syncRouteCommand.h b/src/syncRouteCommand.h index 5bef2f9..0d66ef3 100644 --- a/src/syncRouteCommand.h +++ b/src/syncRouteCommand.h @@ -11,14 +11,15 @@ * tunneling and relaying of packets of any protocol. * * - * Copyright (C) 2007-2008 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, * Christian Pointner * * This file is part of Anytun. * * Anytun is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. * * Anytun is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -28,8 +29,9 @@ * You should have received a copy of the GNU General Public License * along with anytun. If not, see . */ -#ifndef _SYNCROUTECOMMAND_H -#define _SYNCROUTECOMMAND_H +#ifndef ANYTUN_syncRouteCommands_h_INCLUDED +#define ANYTUN_syncRouteCommands_h_INCLUDED + #include #include @@ -40,26 +42,25 @@ class SyncRouteCommand { public: - SyncRouteCommand(const NetworkPrefix & ); - SyncRouteCommand(); - NetworkPrefix getPrefix() const; + SyncRouteCommand(const NetworkPrefix&); + SyncRouteCommand(); + NetworkPrefix getPrefix() const; private: - SyncRouteCommand(const SyncRouteCommand &); - u_int16_t count_; - NetworkPrefix addr_; + SyncRouteCommand(const SyncRouteCommand&); + uint16_t count_; + NetworkPrefix addr_; friend class boost::serialization::access; template - void serialize(Archive & ar, const unsigned int version) - { - Lock lock(gRoutingTable.getMutex()); - ar & addr_; -// u_int16_t & mux (gRoutingTable.getOrNewRoutingTEUnlocked(addr_)); -// ar & mux; - ar & (*(gRoutingTable.getOrNewRoutingTEUnlocked(addr_))); - gRoutingTable.updateRouteTreeUnlocked(addr_); - }; + void serialize(Archive& ar, const unsigned int version) { + Lock lock(gRoutingTable.getMutex()); + ar& addr_; + // uint16_t & mux (gRoutingTable.getOrNewRoutingTEUnlocked(addr_)); + // ar & mux; + ar & (*(gRoutingTable.getOrNewRoutingTEUnlocked(addr_))); + gRoutingTable.updateRouteTreeUnlocked(addr_); + }; }; -#endif // _SYNCCOMMAND_H +#endif