ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-21 17:56:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert some recent tweaks that were causing test failures

Browse Source
This commit is contained in:
Jeremy Lakeman 2016-01-11 16:23:32 +10:30
parent 88020a840d
commit 10ac5733a1
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/org/servalproject/test/CommandLine.java
View File

@ -32,7 +32,7 @@ public class CommandLine {
for(ServalDCommand.IdentityResult i:peers){ for(ServalDCommand.IdentityResult i:peers){
ServalDCommand.IdentityResult details = ServalDCommand.reverseLookup(i.subscriberId); ServalDCommand.IdentityResult details = ServalDCommand.reverseLookup(i.subscriberId);
System.err.println(details.getResult()==0?details.toString():i.toString()); System.out.println(details.getResult()==0?details.toString():i.toString());
} }
} }
@ -40,7 +40,7 @@ public class CommandLine {
MdpDnaLookup lookup = new ServerControl().getMdpDnaLookup(new ChannelSelector(), new AsyncResult<ServalDCommand.LookupResult>() { MdpDnaLookup lookup = new ServerControl().getMdpDnaLookup(new ChannelSelector(), new AsyncResult<ServalDCommand.LookupResult>() {
@Override @Override
public void result(ServalDCommand.LookupResult nextResult) { public void result(ServalDCommand.LookupResult nextResult) {
System.err.println(nextResult.toString()); System.out.println(nextResult.toString());
} }
}); });
lookup.sendRequest(SubscriberId.broadcastSid, did); lookup.sendRequest(SubscriberId.broadcastSid, did);
@ -52,7 +52,7 @@ public class CommandLine {
MdpServiceLookup lookup = new ServerControl().getMdpServiceLookup(new ChannelSelector(), new AsyncResult<MdpServiceLookup.ServiceResult>() { MdpServiceLookup lookup = new ServerControl().getMdpServiceLookup(new ChannelSelector(), new AsyncResult<MdpServiceLookup.ServiceResult>() {
@Override @Override
public void result(MdpServiceLookup.ServiceResult nextResult) { public void result(MdpServiceLookup.ServiceResult nextResult) {
System.err.println(nextResult.toString()); System.out.println(nextResult.toString());
} }
}); });
lookup.sendRequest(SubscriberId.broadcastSid, pattern); lookup.sendRequest(SubscriberId.broadcastSid, pattern);

12
server.c
View File

@ -490,11 +490,13 @@ void server_config_reload(struct sched_ent *alarm)
INFO("server packet filter rules reloaded"); INFO("server packet filter rules reloaded");
break; break;
} }
time_ms_t now = gettime_ms(); if (alarm){
RESCHEDULE(alarm, time_ms_t now = gettime_ms();
now+config.server.config_reload_interval_ms, RESCHEDULE(alarm,
TIME_MS_NEVER_WILL, now+config.server.config_reload_interval_ms,
now+config.server.config_reload_interval_ms+100); TIME_MS_NEVER_WILL,
now+config.server.config_reload_interval_ms+100);
}
} }
/* Called periodically by the server process in its main loop. /* Called periodically by the server process in its main loop.