← Back to branch summary

~mateo-salta/nitroshare/nitroshare

« back to all changes in this revision

Viewing changes to src/discovery/CBasicBroadcaster.cpp

  • Committer: Nathan Osman
  • Date: 2012-06-30 01:18:20 UTC
  • Revision ID: admin@quickmediasolutions.com-20120630011820-c8dz7p16fll1glro
Fixed a couple of bugs with the new broadcast class, added an icon to the wizard, and tweaked things a bit.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/discovery/CBasicBroadcaster.cpp
45
45
    m_timer.stop();
46
46
 
47
47
    /* Attempt to find an IPv4 broadcast and netmask address on the interface. */
48
 
    if(!Network::FindIPv4Address(interface, &m_broadcast_address, &m_netmask_address))
 
48
    if(!Network::FindIPv4Address(interface, NULL, &m_broadcast_address, &m_netmask_address))
49
49
    {
50
50
        emit Error(tr("Unable to find an IPv4 broadcast and netmask address for the specified network interface."));
51
51
        return;
74
74
    info["id"]                = Settings::GetID();
75
75
    info["name"]              = Settings::Get("General/MachineName");
76
76
    info["transmission_port"] = Settings::Get("Network/TransmissionPort");
77
 
    info["uptimer"]           = m_uptime;
 
77
    info["uptime"]            = m_uptime;
78
78
 
79
79
    /* Write the information to the broadcast port we discovered earlier. */
80
80
    writeDatagram(QJson::Serializer().serialize(QVariant(info)),