~mateo-salta/nitroshare/nitroshare

Viewing changes to src/discovery/CBroadcastServer.cpp

Committer: Nathan Osman
Date: 2012-06-29 22:01:55 UTC
Revision ID: admin@quickmediasolutions.com-20120629220155-ogwrn9fxxve9wyw1

Moved a TON of the broadcast and discovery code around, creating separate classes for each and partially implementing their use in the first start wizard.

files added:
include/discovery/CBasicListener.h

include/util/definitions.h

src/discovery/CBasicListener.cpp

src/util/definitions.cpp

files renamed:
include/discovery/CBasicBroadcastServer.h => include/discovery/CBasicBroadcaster.h

src/discovery/CBasicBroadcastServer.cpp => src/discovery/CBasicBroadcaster.cpp

files modified:
include/discovery/CBroadcastServer.h

include/util/network.h

include/widgets/CBroadcastDiscoveryWidget.h

nitroshare.pro

src/dialogs/CSettingsDialog.cpp

src/discovery/CBroadcastServer.cpp

src/file/CFileServer.cpp

src/util/network.cpp

src/widgets/CBroadcastDiscoveryWidget.cpp

ui/CBroadcastDiscoveryWidget.ui

Show diffs side-by-side

added added

removed removed

src/discovery/CBroadcastServer.cpp

m_timer.stop();

/* Attempt to find the broadcast address on the default address. */

if(!Network::FindIPv4Address(Network::GetCurrentInterface(), Network::BroadcastAddress, &m_broadcast_address))

if(!Network::FindIPv4Address(Network::GetCurrentInterface(), NULL, &m_broadcast_address))

{

emit Error(tr("Unable to find an IPv4 broadcast address for the current interface."));

return;

Older »