forked from michirod/cgr-jni
-
Notifications
You must be signed in to change notification settings - Fork 2
/
the-one_v1.6.0.patch
78 lines (72 loc) · 2.61 KB
/
the-one_v1.6.0.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
diff -ruN one.sh one.sh
--- one.sh 2017-04-17 12:30:39.000000000 +0200
+++ one.sh 2017-09-07 17:11:47.751644000 +0200
@@ -1,2 +1,2 @@
#! /bin/sh
-java -Xmx512M -cp target:lib/ECLA.jar:lib/DTNConsoleConnection.jar core.DTNSim $*
+java -Xmx512M -Djava.library.path=$LD_LIBRARY_PATH -cp bin:target:lib/ECLA.jar:lib/DTNConsoleConnection.jar:$CGR_JNI_CLASSPATH core.DTNSim $*
diff -ruN src/core/DTNHost.java src/core/DTNHost.java
--- src/core/DTNHost.java 2017-04-17 12:30:39.000000000 +0200
+++ src/core/DTNHost.java 2017-09-07 17:13:06.394603000 +0200
@@ -19,7 +19,7 @@
* A DTN capable host.
*/
public class DTNHost implements Comparable<DTNHost> {
- private static int nextAddress = 0;
+ private static int nextAddress = 1;
private int address;
private Coord location; // where is the host
@@ -104,7 +104,7 @@
* Reset the host and its interfaces
*/
public static void reset() {
- nextAddress = 0;
+ nextAddress = 1;
}
/**
diff -ruN src/core/NetworkInterface.java src/core/NetworkInterface.java
--- src/core/NetworkInterface.java 2017-04-17 12:30:39.000000000 +0200
+++ src/core/NetworkInterface.java 2017-09-07 17:18:22.175725000 +0200
@@ -513,5 +513,9 @@
return this.address + " of " + this.host +
". Connections: " + this.connections;
}
+
+ public void setTransmitSpeed(int transmitSpeed) {
+ this.transmitSpeed = transmitSpeed;
+ }
}
diff -ruN src/input/EventQueueHandler.java src/input/EventQueueHandler.java
--- src/input/EventQueueHandler.java 2017-04-17 12:30:39.000000000 +0200
+++ src/input/EventQueueHandler.java 2017-09-07 17:19:56.803199000 +0200
@@ -63,7 +63,7 @@
for (int i=1; i <= nrof; i++) {
Settings s = new Settings(SETTINGS_NAMESPACE + i);
- if (s.contains(PATH_SETTING)) { // external events file
+ /*if (s.contains(PATH_SETTING)) { // external events file
int preload = 0;
String path = "";
if (s.contains(PRELOAD_SETTING)) {
@@ -73,7 +73,7 @@
queues.add(new ExternalEventsQueue(path, preload));
}
- else if (s.contains(CLASS_SETTING)) { // event generator class
+ else*/ if (s.contains(CLASS_SETTING)) { // event generator class
String className = CLASS_PACKAGE + "." +
s.getSetting(CLASS_SETTING);
EventQueue eq = (EventQueue)s.createIntializedObject(className);
diff -ruN src/report/MessageStatsReport.java src/report/MessageStatsReport.java
--- src/report/MessageStatsReport.java 2017-04-17 12:30:39.000000000 +0200
+++ src/report/MessageStatsReport.java 2017-09-07 17:15:24.603573000 +0200
@@ -176,7 +176,11 @@
;
write(statsText);
+ write(getMoreInfo());
super.done();
}
-
+
+ protected String getMoreInfo() {
+ return "";
+ }
}