mirror of https://github.com/LX3JL/xlxd.git
XRF peers can now be defined in the xlxd.interlink file, allowing linking of a local module to a remote using the DExtra protocol. XRF peers are shown in the peer list, along with their XLX siblings. Changes affect only how the reflector initiates the link, as xlxd already supports incoming DExtra links. Each peer is associated internally with a remote client, so code changes include distinguishing peer connect acks from non-peer ones and handling timeouts differently for peer clients to clean up the peer data structure. The DExtra disconnect packet is now properly implemented.pull/85/head
Antony Chazapis
8 years ago
parent
4b4658f8c9
commit
49ba30ca25
@ -0,0 +1,99 @@
|
||||
//
|
||||
// cdextrapeer.cpp
|
||||
// xlxd
|
||||
//
|
||||
// Created by Antony Chazapis (SV9OAN) on 25/2/2018.
|
||||
// Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
|
||||
//
|
||||
// ----------------------------------------------------------------------------
|
||||
// This file is part of xlxd.
|
||||
//
|
||||
// xlxd 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 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// xlxd 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 Foobar. If not, see <http://www.gnu.org/licenses/>.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#include "main.h"
|
||||
#include <string.h>
|
||||
#include "creflector.h"
|
||||
#include "cdextrapeer.h"
|
||||
#include "cdextraclient.h"
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
// constructor
|
||||
|
||||
|
||||
CDextraPeer::CDextraPeer()
|
||||
{
|
||||
}
|
||||
|
||||
CDextraPeer::CDextraPeer(const CCallsign &callsign, const CIp &ip, const char *modules, const CVersion &version)
|
||||
: CPeer(callsign, ip, modules, version)
|
||||
{
|
||||
std::cout << "Adding DExtra peer" << std::endl;
|
||||
|
||||
// and construct the DExtra clients
|
||||
for ( int i = 0; i < ::strlen(modules); i++ )
|
||||
{
|
||||
// create
|
||||
CDextraClient *client = new CDextraClient(callsign, ip, modules[i], version.GetMajor());
|
||||
// and append to vector
|
||||
m_Clients.push_back(client);
|
||||
}
|
||||
}
|
||||
|
||||
CDextraPeer::CDextraPeer(const CDextraPeer &peer)
|
||||
: CPeer(peer)
|
||||
{
|
||||
for ( int i = 0; i < peer.m_Clients.size(); i++ )
|
||||
{
|
||||
CDextraClient *client = new CDextraClient((const CDextraClient &)*(peer.m_Clients[i]));
|
||||
// grow vector capacity if needed
|
||||
if ( m_Clients.capacity() == m_Clients.size() )
|
||||
{
|
||||
m_Clients.reserve(m_Clients.capacity()+10);
|
||||
}
|
||||
// and append
|
||||
m_Clients.push_back(client);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
// destructors
|
||||
|
||||
CDextraPeer::~CDextraPeer()
|
||||
{
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
// status
|
||||
|
||||
bool CDextraPeer::IsAlive(void) const
|
||||
{
|
||||
bool alive = true;
|
||||
for ( int i = 0; (i < m_Clients.size()) && alive ; i++ )
|
||||
{
|
||||
alive &= m_Clients[i]->IsAlive();
|
||||
}
|
||||
return alive;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
// revision helper
|
||||
|
||||
int CDextraPeer::GetProtocolRevision(const CVersion &version)
|
||||
{
|
||||
return version.GetMajor();
|
||||
}
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
//
|
||||
// cdextrapeer.h
|
||||
// xlxd
|
||||
//
|
||||
// Created by Antony Chazapis (SV9OAN) on 25/2/2018.
|
||||
// Copyright © 2016 Jean-Luc Deltombe (LX3JL). All rights reserved.
|
||||
//
|
||||
// ----------------------------------------------------------------------------
|
||||
// This file is part of xlxd.
|
||||
//
|
||||
// xlxd 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 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// xlxd 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 Foobar. If not, see <http://www.gnu.org/licenses/>.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#ifndef cdextrapeer_h
|
||||
#define cdextrapeer_h
|
||||
|
||||
#include "cpeer.h"
|
||||
#include "cdextraclient.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
// define
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
// class
|
||||
|
||||
class CDextraPeer : public CPeer
|
||||
{
|
||||
public:
|
||||
// constructors
|
||||
CDextraPeer();
|
||||
CDextraPeer(const CCallsign &, const CIp &, const char *, const CVersion &);
|
||||
CDextraPeer(const CDextraPeer &);
|
||||
|
||||
// destructor
|
||||
~CDextraPeer();
|
||||
|
||||
// status
|
||||
bool IsAlive(void) const;
|
||||
|
||||
// identity
|
||||
int GetProtocol(void) const { return PROTOCOL_DEXTRA; }
|
||||
const char *GetProtocolName(void) const { return "DExtra"; }
|
||||
|
||||
// revision helper
|
||||
static int GetProtocolRevision(const CVersion &);
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
#endif /* cdextrapeer_h */
|
||||
Loading…
Reference in new issue