Skip to content

Commit cace8c2

Browse files
committed
Remove logging config view network diags gen as broken
1 parent d55e91b commit cace8c2

File tree

5 files changed

+35
-7
lines changed

5 files changed

+35
-7
lines changed

core/src/com/biglybt/core/networkmanager/admin/impl/NetworkAdminImpl.java

+23-3
Original file line numberDiff line numberDiff line change
@@ -4717,6 +4717,23 @@ public String getNetworkInterfacesAsString(boolean only_with_addresses)
47174717

47184718
NetworkAdminNetworkInterface[] interfaces = getInterfaces();
47194719

4720+
for (int i=0;i<interfaces.length;i++){
4721+
4722+
networkInterface interf = (networkInterface)interfaces[i];
4723+
4724+
iw.indent();
4725+
4726+
try{
4727+
4728+
interf.generateDiagnostics( iw, public_addresses );
4729+
4730+
}finally{
4731+
4732+
iw.exdent();
4733+
}
4734+
}
4735+
4736+
/*
47204737
if ( FULL_INTF_PROBE ){
47214738
47224739
if ( interfaces.length > 0 ){
@@ -4803,7 +4820,8 @@ public String getNetworkInterfacesAsString(boolean only_with_addresses)
48034820
iw.println( "getRoutes failed: " + Debug.getNestedExceptionMessage( e ));
48044821
}
48054822
}
4806-
4823+
*/
4824+
48074825
iw.println( "Inbound protocols: default routing" );
48084826

48094827

@@ -5052,7 +5070,7 @@ public String getNetworkInterfacesAsString(boolean only_with_addresses)
50525070
iw.println( "" + getAddress());
50535071

50545072
try{
5055-
iw.println( " Trace route" );
5073+
//iw.println( " Trace route" );
50565074

50575075
iw.indent();
50585076

@@ -5062,6 +5080,7 @@ public String getNetworkInterfacesAsString(boolean only_with_addresses)
50625080

50635081
}else{
50645082

5083+
/*
50655084
try{
50665085
String domain = COConfigurationManager.getStringParameter(
50675086
ConfigKeys.Connection.SCFG_CONNECTION_TEST_DOMAIN);
@@ -5077,7 +5096,8 @@ public String getNetworkInterfacesAsString(boolean only_with_addresses)
50775096
50785097
iw.println( "Can't resolve host for route trace - " + e.getMessage());
50795098
}
5080-
5099+
*/
5100+
50815101
iw.println( "Outbound protocols: bound" );
50825102

50835103
Core core = CoreFactory.getSingleton();

core/src/com/biglybt/core/networkmanager/admin/impl/NetworkAdminProtocolImpl.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package com.biglybt.core.networkmanager.admin.impl;
2222

2323

24+
import java.net.Inet6Address;
2425
import java.net.InetAddress;
2526

2627
import com.biglybt.core.Core;
@@ -106,7 +107,9 @@
106107

107108
throws NetworkAdminException
108109
{
109-
return( test( address, false, upnp_map, listener ));
110+
InetAddress ia = address.getAddress();
111+
112+
return( test( address, ia instanceof Inet6Address, upnp_map, listener ));
110113
}
111114

112115
@Override

core/src/com/biglybt/platform/win32/PlatformManagerImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2128,7 +2128,7 @@ public void showFile(String file_name)
21282128

21292129
}catch( Throwable e ){
21302130

2131-
throw( new PlatformManagerException( "Failed to trace route", e ));
2131+
throw( new PlatformManagerException( "Failed to ping", e ));
21322132
}
21332133
}
21342134

core/src/com/biglybt/platform/win32/access/impl/AEWin32AccessImpl.java

+4
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,9 @@ public int shellExecute(String operation, String file, String parameters,
512512

513513
throws AEWin32AccessException
514514
{
515+
throw( new AEWin32AccessException( "Sorry, traceRoute is broken" )); // causing crashes/not working
516+
517+
/*
515518
int trace_id;
516519
517520
synchronized( this ){
@@ -527,6 +530,7 @@ public int shellExecute(String operation, String file, String parameters,
527530
addressToInt( target_address ),
528531
ping_mode?1:0,
529532
cb );
533+
*/
530534
}
531535

532536
private int

core/src/com/biglybt/ui/config/ConfigSectionLogging.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public void build() {
287287
pgAdvSetting.setNumberOfColumns(3);
288288

289289
// network diagnostics
290-
290+
/* this is all fubar
291291
ActionParameterImpl generate_net_button = new ActionParameterImpl(
292292
"ConfigView.section.logging.netinfo",
293293
"ConfigView.section.logging.generatediagnostics");
@@ -319,7 +319,8 @@ public void run() {
319319
320320
}
321321
}.start());
322-
322+
*/
323+
323324
// stats
324325

325326
ActionParameterImpl generate_stats_button = new ActionParameterImpl(

0 commit comments

Comments
 (0)