Skip to content

Commit

Permalink
types/sender added to all internal messages; notify icon on warnings+…
Browse files Browse the repository at this point in the history 
…errors in messages added
  • Loading branch information
seuffert committed May 12, 2011
1 parent 3932083 commit e8e93b0
Show file tree
Hide file tree
Showing 21 changed files with 278 additions and 196 deletions.
60 changes: 30 additions & 30 deletions XBSlink/CommandLine.cs
View file
Expand Up @@ -22,7 +22,7 @@ class xbs_console_app
public static xbs_sniffer sniffer = null;
public static xbs_node_list node_list = null;
public static xbs_nat NAT = null;
private xbs_natstun natstun = null;
private xbs_upnp upnp = null;
private xbs_cloudlist cloudlist = null;

private Thread MessageThread = null;
Expand Down Expand Up @@ -105,13 +105,13 @@ private void close_app( int exit_code )
udp_listener.shutdown();
udp_listener = null;
}
if (natstun != null)
if (natstun.isUPnPavailable())
natstun.upnp_deleteAllPortMappings();
if (upnp != null)
if (upnp.isUPnPavailable())
upnp.upnp_deleteAllPortMappings();

stop_threads();
#if DEBUG
xbs_messages.addDebugMessage("exiting program.");
xbs_messages.addDebugMessage("exiting program.", xbs_message_sender.GENERAL);
#endif
output_queued_messages();
#if DEBUG
Expand Down Expand Up @@ -185,7 +185,7 @@ private void start_engine()
LibPcapLiveDevice pdev = loadCaptureDevice(option_capture_device);
if (pdev == null)
{
xbs_messages.addInfoMessage("!! ERROR - could not load capture device with name \"" + option_capture_device + "\"");
xbs_messages.addInfoMessage("!! ERROR - could not load capture device with name \"" + option_capture_device + "\"", xbs_message_sender.GENERAL, xbs_message_type.FATAL_ERROR);
close_app(-2);
}

Expand All @@ -201,25 +201,25 @@ private void start_engine()
}
catch (Exception e)
{
xbs_messages.addInfoMessage("!! ERROR opening UDP port " + option_local_port);
xbs_messages.addInfoMessage(e.Message);
xbs_messages.addInfoMessage("!! ERROR opening UDP port " + option_local_port, xbs_message_sender.GENERAL, xbs_message_type.FATAL_ERROR);
xbs_messages.addInfoMessage(e.Message, xbs_message_sender.GENERAL);
close_app(-7);
}

try
{
if (option_upnp && natstun.isUPnPavailable())
if (option_upnp && upnp.isUPnPavailable())
{
external_ip = natstun.upnp_getPublicIP();
natstun.upnp_create_mapping(Mono.Nat.Protocol.Udp, udp_listener.udp_socket_port, udp_listener.udp_socket_port);
external_ip = upnp.upnp_getPublicIP();
upnp.upnp_create_mapping(Mono.Nat.Protocol.Udp, udp_listener.udp_socket_port, udp_listener.udp_socket_port);
}
}
catch (Exception)
{
xbs_messages.addInfoMessage("!! UPnP port mapping failed");
xbs_messages.addInfoMessage("!! UPnP port mapping failed", xbs_message_sender.GENERAL, xbs_message_type.ERROR);
}
if (external_ip == null)
external_ip = xbs_natstun.getExternalIPAddressFromWebsite();
external_ip = xbs_upnp.getExternalIPAddressFromWebsite();
IPAddress local_node_ip = (external_ip == null) ? option_local_ip : external_ip;
node_list.local_node = new xbs_node(local_node_ip, udp_listener.udp_socket_port);
if (option_nickname!=null)
Expand All @@ -242,17 +242,17 @@ private void start_engine()
{
try
{
cloudlist.JoinOrCreateCloud(option_cloudserver, option_cloudname, option_maxnodes.ToString(), option_password, node_list.local_node.ip_public, node_list.local_node.port_public, node_list.local_node.nickname, xbs_natstun.isPortReachable);
cloudlist.JoinOrCreateCloud(option_cloudserver, option_cloudname, option_maxnodes.ToString(), option_password, node_list.local_node.ip_public, node_list.local_node.port_public, node_list.local_node.nickname, xbs_upnp.isPortReachable);
}
catch (Exception e)
{
xbs_messages.addInfoMessage("!! ERROR connection to cloud " + option_cloudname);
xbs_messages.addInfoMessage(e.Message);
xbs_messages.addInfoMessage("!! ERROR connecting to cloud " + option_cloudname, xbs_message_sender.GENERAL, xbs_message_type.ERROR);
xbs_messages.addInfoMessage(e.Message, xbs_message_sender.GENERAL, xbs_message_type.ERROR);
}
}
else
{
xbs_messages.addInfoMessage("!! ERROR - cloudname is too short. " + xbs_cloudlist.MIN_CLOUDNAME_LENGTH+" chars minimum");
xbs_messages.addInfoMessage("!! ERROR - cloudname is too short. " + xbs_cloudlist.MIN_CLOUDNAME_LENGTH + " chars minimum", xbs_message_sender.GENERAL, xbs_message_type.ERROR);
close_app(-12);
}
}
Expand Down Expand Up @@ -306,7 +306,7 @@ private void initialize()
{
node_list = new xbs_node_list();
udp_listener = new xbs_udp_listener(node_list);
natstun = new xbs_natstun();
upnp = new xbs_upnp();
}

private void list_Devices(String[] args)
Expand Down Expand Up @@ -354,7 +354,7 @@ private void start_message_thread()

private void message_thread_start()
{
xbs_messages.addDebugMessage(" * message dispatcher thread starting...");
xbs_messages.addDebugMessage(" * message dispatcher thread starting...", xbs_message_sender.COMMANDLINE_MESSAGE_DISCPATCHER);
#if !DEBUG
try
{
Expand Down Expand Up @@ -410,28 +410,28 @@ private bool loadCaptureDeviceList()
}
catch (Exception)
{
xbs_messages.addInfoMessage("!! ERRROR getting Pcap capture device list.");
xbs_messages.addInfoMessage("!! ERROR while getting Pcap capture device list.", xbs_message_sender.GENERAL, xbs_message_type.FATAL_ERROR);
}
return (capture_devices.Count > 0);
}

private void discover_upnp()
{
natstun = new xbs_natstun();
natstun.upnp_startDiscovery();
upnp = new xbs_upnp();
upnp.upnp_startDiscovery();
int count = 0;
while (!natstun.isUPnPavailable() && count < (80))
while (!upnp.isUPnPavailable() && count < (80))
{
Thread.Sleep(250);
count++;
}
if (natstun.isUPnPavailable())
external_ip = natstun.upnp_getPublicIP();
if (upnp.isUPnPavailable())
external_ip = upnp.upnp_getPublicIP();
}

private void handleCancelKeyPress()
{
xbs_messages.addInfoMessage("!! cancel key pressed. closing threads.");
xbs_messages.addInfoMessage("!! cancel key pressed. closing threads.", xbs_message_sender.GENERAL, xbs_message_type.WARNING);
close_app(0);
}

Expand Down Expand Up @@ -509,7 +509,7 @@ private void initCaptureDeviceList()
msg = Resources.message_no_capture_devices_startNPF;
else
msg = Resources.message_no_capture_devices;
xbs_messages.addInfoMessage("!! ERROR: " + msg);
xbs_messages.addInfoMessage("!! ERROR: " + msg, xbs_message_sender.GENERAL, xbs_message_type.FATAL_ERROR);
close_app(-1);
}
}
Expand All @@ -522,11 +522,11 @@ private void checkForProgramUpdates()
{
int new_version_found = result.CompareTo(xbs_settings.xbslink_version);
if (new_version_found > 0)
xbs_messages.addInfoMessage("A new version of XBSlink is available! (v" + result + ")");
xbs_messages.addInfoMessage("A new version of XBSlink is available! (v" + result + ")", xbs_message_sender.GENERAL);
else if (new_version_found < 0)
xbs_messages.addInfoMessage("Latest XBSlink version found: v" + result);
xbs_messages.addInfoMessage("Latest XBSlink version found: v" + result, xbs_message_sender.GENERAL);
else
xbs_messages.addInfoMessage("You are using the latest XBSlink version.");
xbs_messages.addInfoMessage("You are using the latest XBSlink version.", xbs_message_sender.GENERAL);
}
}

Expand Down
2 changes: 1 addition & 1 deletion XBSlink/DebugWindow.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions XBSlink/DebugWindow.resx
View file
Expand Up @@ -120,4 +120,7 @@
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>47</value>
</metadata>
</root>
42 changes: 27 additions & 15 deletions XBSlink/Form1.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e8e93b0

Please sign in to comment.