* Added Relay display to MainWindow.

* Updated genTestNet to make it easier to edit.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-peernet@4308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-06-20 18:02:49 +00:00
parent 57b097edbb
commit f759638630
8 changed files with 693 additions and 500 deletions

View File

@ -1,500 +1,500 @@
112.207.122.61 45489
212.115.244.50 61640
212.139.217.146 11889
212.139.217.146 11876
46.214.208.159 43422
78.148.195.46 27559
78.150.212.173 22224
212.139.217.146 11904
95.226.48.189 16113
189.155.11.83 10066
78.26.164.208 11542
212.139.217.146 11877
82.141.191.250 6149
1.22.249.95 30134
62.122.68.244 65215
83.23.181.22 22074
94.240.133.253 35691
24.177.55.18 27659
83.175.179.86 22947
178.95.25.34 10629
94.27.214.209 12614
124.6.181.104 39740
78.230.90.8 10861
93.78.219.90 38299
74.212.167.146 30158
212.139.217.146 11873
92.158.151.122 58496
212.139.217.146 11898
79.132.119.62 26032
94.64.155.139 29680
46.159.236.190 28486
85.230.170.213 11218
76.224.231.127 18769
217.208.165.110 55002
212.139.217.146 11802
178.40.130.200 28853
212.139.217.146 11910
116.71.30.241 10027
96.252.103.20 25371
75.65.212.238 51320
71.83.40.179 57064
143.90.181.3 62198
212.139.217.146 11921
223.204.29.104 11438
188.120.211.16 39092
212.139.217.146 11843
82.225.83.25 19693
178.123.123.138 19174
190.98.112.243 29779
60.240.253.89 45682
46.11.87.172 39287
81.206.55.20 51154
89.208.242.38 28222
109.227.209.138 14557
140.116.25.246 29850
61.24.86.59 17
68.121.60.202 24860
81.247.116.196 58638
194.44.174.33 11653
95.176.175.236 9256
109.165.50.223 25319
79.31.174.131 30212
212.139.217.146 11927
212.139.217.146 11939
187.38.54.27 10208
89.161.26.23 35383
178.176.9.238 41471
178.44.193.163 30516
117.192.139.164 24561
75.117.67.42 61050
212.139.217.146 11940
186.206.234.157 12136
212.139.217.146 11944
89.132.118.81 11762
75.117.67.42 61058
176.14.103.184 13973
212.139.217.146 11951
212.139.217.146 11836
58.215.242.74 1103
212.139.217.146 11890
212.139.217.146 11952
202.106.53.78 59461
178.212.78.195 49695
201.9.243.131 35311
67.204.7.51 16247
186.212.57.40 39646
212.139.217.146 11934
115.242.184.10 24818
212.139.217.146 11916
84.133.198.167 10495
90.230.133.68 55332
92.99.94.98 56574
212.139.217.146 11980
212.139.217.146 11943
96.228.172.112 50103
117.194.97.246 25110
124.122.224.48 12646
109.86.128.78 3517
41.237.228.52 11398
212.139.217.146 11971
212.139.217.146 11989
77.69.207.172 11699
188.186.22.224 21250
81.153.128.80 35986
94.196.219.239 25797
31.16.86.30 26003
213.226.169.17 53769
178.206.54.57 32119
212.139.217.146 11918
189.240.140.204 40919
212.139.217.146 11953
188.241.32.103 17499
168.20.228.179 28471
124.8.223.142 16880
85.95.200.144 55358
212.139.217.146 11966
212.139.217.146 11961
111.92.122.154 54370
95.144.135.206 52489
183.82.231.121 59703
212.139.217.146 11977
93.89.58.101 10333
151.49.65.45 52969
212.139.217.146 11661
117.196.217.86 12437
222.183.70.162 51541
94.251.30.95 52072
212.139.217.146 11837
83.28.72.14 30792
212.139.217.146 11797
79.102.55.113 34118
109.152.184.81 18670
213.151.5.17 39860
212.139.217.146 11993
212.139.217.146 11804
95.29.119.143 53849
151.75.95.168 61765
2.6.187.140 11874
75.73.93.28 59127
193.169.44.203 19795
178.76.220.14 26921
85.242.185.197 53876
83.239.216.12 33654
70.26.106.140 37651
121.212.12.50 35466
212.139.217.146 11990
90.231.204.152 47621
212.139.217.146 11973
212.139.217.146 12018
71.45.107.99 34140
77.47.167.188 16413
108.66.43.123 61779
212.139.217.146 11859
46.72.153.147 54896
190.253.207.163 10575
182.53.61.50 10038
212.139.217.146 11820
211.27.43.35 29717
96.43.239.132 59068
212.139.217.146 12033
212.139.217.146 12027
178.222.105.154 10000
180.191.53.46 23885
92.55.30.19 64833
212.139.217.146 11848
212.139.217.146 11866
109.199.236.32 17531
194.28.222.2 21245
46.241.27.55 32327
212.139.217.146 12030
212.139.217.146 12031
93.138.185.237 42636
188.208.36.109 54741
117.65.134.100 11818
174.60.89.157 45259
212.139.217.146 11874
212.139.217.146 11647
212.139.217.146 11825
74.216.21.206 17552
95.73.127.245 10005
212.139.217.146 11754
212.139.217.146 12024
212.139.217.146 11730
93.26.3.164 23713
14.45.166.191 26876
212.139.217.146 12002
212.139.217.146 12009
212.139.217.146 11850
121.54.32.131 13443
212.139.217.146 12035
178.175.80.169 16218
173.63.28.251 43747
212.139.217.146 11717
212.139.217.146 11650
212.139.217.146 12028
212.139.217.146 11926
212.139.217.146 12013
69.138.161.130 23976
212.139.217.146 11719
212.139.217.146 11683
114.24.6.239 22812
212.139.217.146 11721
212.139.217.146 11766
212.139.217.146 12023
90.206.110.191 36080
212.139.217.146 11862
46.238.202.1 64568
212.139.217.146 11648
201.79.12.167 50102
113.190.37.156 48704
94.112.75.163 46513
212.139.217.146 11736
212.139.217.146 11759
212.139.217.146 12021
203.99.173.51 57929
212.139.217.146 12020
98.99.202.70 58002
187.113.232.117 51790
109.182.68.166 62260
212.139.217.146 11758
88.135.161.101 1024
212.139.217.146 11746
212.139.217.146 12015
212.139.217.146 11641
113.165.18.254 10033
109.77.23.106 33037
205.206.74.3 55582
2.89.126.67 10098
94.231.48.5 62087
212.139.217.146 11800
212.139.217.146 11815
212.139.217.146 11640
212.139.217.146 11642
46.2.70.183 1101
86.100.247.99 14846
120.63.14.216 13490
178.150.56.145 63828
212.139.217.146 11871
212.139.217.146 11868
79.107.217.18 64451
212.139.217.146 12006
212.139.217.146 12012
212.35.18.211 28330
75.88.44.198 60971
212.139.217.146 12011
212.139.217.146 12032
221.209.62.74 43147
84.196.243.19 48922
93.44.99.79 64276
212.139.217.146 11658
124.148.198.132 14663
212.139.217.146 11744
95.26.215.96 35054
46.185.19.224 21714
93.87.180.81 20975
92.243.167.188 57734
212.139.217.146 11667
212.139.217.146 11665
92.86.240.28 13975
173.54.41.248 57329
178.123.216.78 57152
95.139.138.109 13882
188.19.254.203 50266
212.139.217.146 11655
212.139.217.146 11669
78.230.16.44 23957
75.151.72.182 56265
180.230.234.60 18674
187.40.59.86 61240
89.74.236.69 12237
195.189.107.132 30143
154.20.253.148 29820
212.139.217.146 11663
212.139.217.146 11651
178.95.214.19 46959
187.78.75.55 38578
97.96.15.133 37800
91.146.166.137 13093
89.106.233.207 9889
189.104.42.109 43197
188.230.192.187 52543
46.107.242.158 6881
212.232.14.183 54616
173.53.63.32 51876
78.60.131.27 44353
86.58.106.144 44821
86.58.106.144 44656
95.178.163.118 10040
86.58.106.144 44887
86.58.106.144 45040
86.58.106.144 45053
67.162.186.239 28803
84.120.136.105 32850
115.43.156.110 34775
77.215.187.40 51413
24.64.255.14 42832
109.70.52.238 44500
220.208.137.27 14073
84.122.175.250 17226
212.139.217.146 11639
79.168.197.23 26861
87.239.161.29 37863
79.114.192.207 28146
77.239.71.136 11997
81.236.195.180 18203
78.247.178.58 31218
82.117.224.17 40005
72.23.223.10 35313
212.139.217.146 11662
95.32.130.5 41696
95.79.67.118 16945
88.198.183.157 32257
134.106.236.63 7584
77.236.180.53 22337
114.17.132.233 19663
88.178.72.2 7812
88.168.14.141 46232
91.217.91.11 39192
79.142.169.27 11404
134.106.236.73 32092
81.13.186.186 27652
99.22.212.223 51413
85.198.170.202 19072
82.232.0.124 9156
82.244.203.153 21428
88.187.80.252 49180
95.90.231.148 35420
72.207.215.101 36844
67.188.133.52 41610
67.190.19.67 61407
188.123.252.97 23741
212.80.57.57 32646
89.252.42.111 62101
85.220.111.51 45435
99.241.83.62 1723
89.174.79.62 25812
78.29.117.80 49431
41.35.118.144 10942
119.46.206.23 16880
119.152.72.72 36324
78.21.229.179 60005
90.220.122.198 13134
74.89.237.152 60454
212.139.217.146 11686
2.123.218.171 23949
201.9.223.200 30617
87.120.82.153 9088
195.114.136.71 51981
212.139.217.146 11698
111.250.38.229 18254
151.49.85.221 38449
93.126.72.23 39391
94.62.225.94 11454
95.179.113.191 28329
95.80.59.11 65098
188.62.25.223 56591
213.199.197.114 25115
78.84.243.30 33282
212.139.217.146 11660
49.203.19.202 38852
212.139.217.146 11676
189.124.210.225 4675
50.53.55.126 55170
173.66.140.59 41033
178.82.230.13 15374
212.139.217.146 11708
212.139.217.146 11681
212.139.217.146 11689
186.107.117.101 32771
212.139.217.146 11705
89.242.136.42 58883
212.139.217.146 11792
79.172.15.226 55121
188.2.40.106 35697
212.139.217.146 11682
222.223.191.149 1430
90.148.156.135 25885
24.177.161.62 35727
212.139.217.146 11693
203.217.170.217 30874
80.78.101.200 61523
77.39.38.204 37985
202.133.55.164 33171
178.218.48.18 1099
96.51.81.67 34848
80.252.240.10 35691
78.234.176.210 1127
109.110.92.246 32296
87.2.122.2 62144
178.121.100.139 20767
85.210.38.111 20002
91.203.26.250 35691
95.190.88.173 6881
85.210.38.111 19969
188.112.100.65 48383
87.179.236.249 59052
86.208.6.127 12626
61.94.131.92 20868
78.100.208.50 49167
76.105.119.12 51907
77.232.141.42 1091
92.126.119.204 64747
123.48.140.103 61951
94.64.163.174 57313
69.108.1.1 56567
178.251.108.66 61945
115.118.45.148 35892
88.170.1.199 60144
190.167.138.244 26974
182.177.82.129 27209
24.15.140.50 39343
212.139.217.146 12034
178.222.191.26 10424
212.139.217.146 11659
92.244.240.183 45401
212.139.217.146 11706
88.182.24.189 17082
89.73.55.97 50357
121.54.32.149 12068
46.42.46.94 29505
212.139.217.146 11788
121.108.23.84 27819
74.111.124.181 13600
24.109.74.245 18373
88.103.43.81 27717
86.88.254.80 7146
109.86.206.38 54758
62.30.80.254 9090
184.57.56.28 18081
212.139.217.146 11805
99.194.42.156 22326
94.10.47.41 12834
81.15.207.71 44962
24.7.235.189 37054
69.125.230.16 51692
220.141.38.175 8921
223.132.67.43 15754
178.140.26.238 28931
78.36.208.59 62971
89.123.159.130 27517
2.219.35.144 31126
118.90.128.175 6812
212.54.29.154 48436
2.94.16.180 13053
212.139.217.146 11687
95.26.163.75 29744
178.45.9.29 1239
77.49.21.181 59165
94.213.103.5 37531
108.67.134.107 47364
98.253.91.238 46177
2.25.38.121 37947
212.139.217.146 11645
76.172.170.183 13553
95.132.7.71 56227
77.206.43.32 54191
124.102.13.102 45682
87.96.227.162 36782
60.238.250.73 21566
212.139.217.146 11842
41.237.186.57 33336
173.217.246.214 13494
122.162.152.124 60853
212.139.217.146 11844
109.150.82.218 19591
99.184.100.63 40205
81.191.108.58 32123
212.139.217.146 11769
184.56.117.74 31764
212.139.217.146 11699
41.178.83.92 42994
87.90.94.159 62640
186.4.6.162 44659
212.139.217.146 11806
212.139.217.146 11727
86.97.72.240 54516
112.205.59.68 62449
197.1.100.218 40227
116.71.174.200 26046
188.114.16.34 53426
122.150.252.60 29049
46.247.199.83 51000
193.151.81.140 2541
69.171.163.146 38809
95.79.92.140 27822
189.115.166.104 40939
188.134.60.83 34466
83.128.66.50 23306
217.173.21.18 44913
75.37.76.247 54498
182.18.209.111 55175
78.87.36.96 52234
217.151.50.135 34663
178.177.15.116 64559
213.108.169.251 52642
82.44.220.175 17627
174.59.66.22 45542
68.102.204.198 45538
46.240.114.178 1035
92.73.220.200 37808
184.155.124.198 1760
116.68.205.230 17766
93.6.71.124 6881
27.106.45.102 17129
78.224.127.28 51413
62.198.147.128 53000
50.53.11.193 20252
190.250.203.79 28940
122.168.160.76 64204
142.68.150.203 25265
77.111.38.57 6112
178.158.129.156 53156
80.90.168.147 12107
82.36.28.38 53598
80.245.125.101 18281
78.9.112.104 60101
81.236.213.187 55702
77.37.173.222 17952
87.120.81.236 24099
94.143.40.37 15029
46.138.56.95 12460
82.170.50.47 12077
70.65.69.190 61162
95.139.201.69 26942
137.186.166.21 60083
61.36.189.19 28156
109.196.27.89 19426
88.218.40.50 64051
95.134.37.74 19759
178.176.213.37 62907
67.191.251.240 6948
74.13.82.14 23671
175.142.137.43 16580
69.231.200.182 1232
118.100.188.133 26823
65.0.147.109 52384
173.180.193.221 45097
108.18.183.88 28878
178.123.26.34 35691
118.175.28.40 62040
67.182.148.53 52368
71.235.255.153 42753
178.131.149.74 1024
89.254.200.15 29205
71.137.205.162 58833
2.102.201.255 56665
115.137.13.82 32102
95.134.241.47 14246
94.181.132.96 41286
118.100.202.71 15457
24.64.255.168 60790
182.185.162.177 49767
82.229.248.131 53867
84.126.150.250 48969
94.196.180.219 29278
89.189.169.9 64036
71.23.6.10 33593
89.134.11.198 5920
92.99.142.104 40298
111.255.13.248 8303
88.224.46.15 12428
187.147.33.33 10324
85.227.133.190 7180
122.164.119.251 16089
195.1.121.159 49701
66.57.69.241 10926
94.31.150.58 35691
188.49.91.110 40169
210.203.254.254 51413
85.210.38.111 19949
85.210.38.111 19909
96.48.192.208 53836
182.64.124.126 38168
88.172.13.116 51413
109.92.112.129 22936
117.196.161.248 51910
82.84.223.109 56185
190.232.74.186 10033
85.166.14.181 23781
78.14.205.151 24322
93.125.159.58 58601
78.14.205.151 24519
109.228.69.62 47894
142.68.95.81 19369
81.9.142.95 18940
109.254.45.134 57844
125.27.17.134 12232
86.28.116.226 2668
180.194.46.228 8276
90.176.46.150 21697
98.210.187.110 19898
178.65.64.14 57445
67.234.252.161 11927
74.32.95.253 53323
89.83.53.151 65024
94.190.193.155 55228
188.24.117.90 62312
212.104.80.34 31862
109.197.112.31 61609
195.97.110.132 52875
74.88.46.11 61209
109.187.214.177 15322
46.162.95.240 52703
178.203.129.209 47916
84.237.163.170 41656
109.124.82.91 16013
80.95.21.118 42418
41.228.227.238 31781
85.26.164.93 16730
49.49.125.183 13162
124.8.223.131 16880
77.120.141.223 37934
24.215.67.68 22373
62.176.15.8 10243
189.115.31.189 13424
108.28.196.97 29891
79.175.118.223 14775
119.42.69.50 27990
123.178.142.202 17496
80.216.132.26 50931
121.54.54.36 3023
195.114.142.104 51981
178.203.144.149 18216
90.23.215.122 38441
88.173.100.176 54193
83.134.13.245 6880
92.142.104.243 48000
186.206.12.33 8291
109.254.49.13 15322
95.34.58.144 48642
91.217.91.11 39192
144.85.175.55 51319
88.189.82.239 5666
89.163.47.59 42236
61.26.132.128 20467
85.141.182.218 26551
124.86.55.118 12808
174.89.132.196 60002
93.81.173.161 20440
90.155.221.225 39205
70.78.210.9 1298
95.190.121.226 31234
109.53.138.103 50703
93.132.90.224 5188
89.134.230.77 62153
134.106.236.73 32092
78.92.198.104 40643
77.85.131.21 21310
85.210.38.111 20071
41.224.125.14 55307
189.69.114.40 1076
67.188.133.52 41610
84.212.113.134 37675
41.230.228.52 29852
178.90.39.54 15769
85.210.38.111 20040
99.241.83.62 1723
174.78.66.72 38024
31.47.172.92 1044
119.246.23.104 7579
84.101.63.207 18016
79.105.169.154 22075
212.178.11.237 36412
118.173.147.186 12775
76.183.242.116 56806
178.162.242.146 37592
85.210.38.111 20029
109.203.19.10 47776
188.95.214.180 25538
41.137.23.157 21536
85.210.38.111 19869
76.174.241.230 59344
218.186.99.145 21190
189.82.4.53 47779
2.82.216.224 28160
85.210.38.111 19951
187.0.225.7 60317
46.48.170.112 39721
85.210.38.111 19868
164.8.221.24 31547
91.139.186.168 27947
95.211.8.11 25896
69.198.251.177 22146
68.93.74.85 25378
122.176.245.208 45682
125.59.156.33 32401
134.106.236.63 7584
83.128.120.21 51431
95.52.104.115 14112
85.210.38.111 19898
109.70.52.238 44500
95.26.117.116 64874
85.210.38.111 19957
88.149.180.60 51414
201.75.105.21 43298
78.100.236.49 40809
92.49.178.248 21131
92.154.124.137 47816
90.220.199.212 42682
46.177.118.125 48545
85.210.38.111 19828
207.81.138.15 1975
46.187.39.136 44658
109.229.0.181 11795
85.210.38.111 19693
88.186.107.212 8660
101.140.84.139 61461
81.234.194.192 61049
95.30.219.148 46630
95.30.94.188 37915
186.32.81.120 13178
116.199.161.210 18875
78.112.75.247 16969
112.164.232.8 17207
85.210.38.111 19790
201.6.182.65 29017
92.114.3.126 35521
46.185.40.138 35691
85.210.38.111 19849
71.203.222.193 11243
88.198.183.157 32257
85.151.56.108 50040
107.10.32.153 6881
89.47.86.152 63650
85.210.38.111 20044
88.179.250.21 42329
221.153.66.253 40650
95.27.131.41 42799
77.80.249.28 32894
98.221.3.209 23762
88.178.72.2 7812
93.103.72.182 49529
79.131.185.51 28886
213.107.66.202 41381
95.80.59.11 55494
69.118.24.163 43611
120.51.210.154 443
85.210.38.111 19695
90.149.130.169 39191
83.157.69.174 20504
130.243.191.202 24410
109.207.196.189 14146
65.96.192.106 20277
68.2.142.67 39571
85.210.38.111 20024
189.103.144.5 12351
78.48.11.9 46913
174.42.210.123 35053
94.30.130.58 18116
88.171.224.208 54755
85.210.38.111 20043
62.147.204.92 7812
188.80.161.77 52343
77.41.99.77 60590
85.210.38.111 20033
178.123.85.47 38504
92.248.226.221 55061
216.137.133.89 44376
201.11.235.148 33618
85.210.38.111 19789
178.223.136.94 10060
78.137.52.144 19547
78.139.231.192 50734
85.210.38.111 19954
221.24.70.141 61625
69.199.102.6 48234
85.15.70.92 53210
85.210.38.111 19992
82.244.203.153 21428
76.199.97.225 62729
189.82.213.9 61402
50.88.148.45 38303
87.10.130.213 26436
176.14.55.15 51813
110.254.168.210 40626
80.60.161.46 53490
217.197.6.47 30000
93.152.129.100 26707
62.165.228.234 24958
85.210.38.111 19866
174.1.101.83 9406
187.127.72.162 21380
84.247.22.75 25850
46.186.54.192 26016
61.210.66.191 36578
178.94.154.111 23923
109.110.94.70 30954
95.52.255.62 63245
82.224.136.52 7890
91.116.191.138 4662
213.250.22.253 50254
85.210.38.111 19926
87.228.93.4 51915
62.228.21.148 15495
200.86.205.61 34635
94.59.178.235 10379
1.175.139.234 27959
65.94.96.85 48004
88.152.129.72 29440
109.93.217.79 11526
95.211.8.11 1140
50.104.19.222 27902
77.66.238.64 41810
85.210.38.111 19935
27.32.111.217 40217
178.222.42.90 29384
80.149.19.153 32528
92.142.169.56 13452
217.211.244.154 24932
1.83.139.64 16001
46.72.130.102 55045
85.210.38.111 19894
178.235.29.152 41661
59.113.155.14 21775
221.145.157.133 41323
78.144.43.115 42272
83.145.228.244 23147
69.59.103.85 22750
85.210.38.111 19697
93.81.73.84 44144
84.40.83.186 1660
121.167.12.118 39840
79.100.162.25 54856
178.49.145.136 12665
85.210.38.111 19784
217.164.118.188 13026
83.26.8.229 9849
63.234.11.132 27352
125.27.93.175 16816
83.193.168.78 44075
174.53.219.63 57942
85.210.38.111 19955
46.1.73.188 6881
190.44.21.47 17082
85.210.38.111 19749
85.210.38.111 20025
78.229.223.205 36531
90.220.124.142 39540
79.113.218.66 63123
79.116.206.103 58889
24.1.118.110 27704
85.210.38.111 19851
79.119.95.94 46983
77.232.20.26 43250
223.218.101.122 62548
41.227.56.179 22716
95.90.231.148 35420
94.101.207.170 62580
78.14.205.151 24211
85.210.38.111 19962
112.119.180.21 59328
81.92.179.110 47662
85.210.38.111 19736
46.185.19.224 21714
88.135.170.12 13761
61.18.255.9 50239
94.188.38.151 63933
86.106.214.64 35691
82.232.0.124 9156
24.64.255.14 42832
189.121.6.224 45063
86.62.100.113 44610
220.224.225.94 23365
85.210.38.111 19755
75.23.9.181 51498
89.102.166.183 18088
46.9.235.202 6881
78.25.142.245 25505
94.181.187.209 38043
67.166.179.95 51679
82.114.79.194 60356
212.139.217.146 11768
188.16.13.177 34023
111.108.62.171 42735
212.139.217.146 11703
76.221.166.57 35192
91.214.31.241 6881
99.109.66.184 38309
92.249.121.191 23576
212.139.217.146 11852
81.231.75.170 45268
212.139.217.146 11870
178.72.97.192 37310
212.139.217.146 11936
178.218.42.155 1073
83.149.38.136 17408
95.37.63.97 46000
212.139.217.146 11668
117.206.68.126 16894
77.108.110.160 61890
77.38.24.51 9897
212.139.217.146 11947
212.139.217.146 11684
212.139.217.146 11928
93.12.199.146 50797
98.183.153.23 39212
213.5.222.186 3142
84.238.34.216 55202
85.210.38.111 19826
213.245.73.220 15641
90.191.77.198 44825
75.137.112.233 16873
93.100.44.38 23175
223.217.219.211 21119
183.83.51.187 12904
99.66.229.86 30732
98.64.93.81 46213
62.65.221.25 59745
93.139.101.103 58439
88.187.80.252 49180
188.26.171.65 37450
212.139.217.146 11764
46.175.64.4 65292
95.132.212.174 27012
212.139.217.146 11646
212.139.217.146 11913
212.139.217.146 11798
81.5.78.192 40262
95.76.135.137 36391
212.139.217.146 11720
80.108.110.218 19624
212.139.217.146 11903
212.139.217.146 11723
212.139.217.146 11894
212.139.217.146 11851
95.30.140.2 46257
212.139.217.146 11803
212.139.217.146 11920
212.139.217.146 11878
212.161.131.86 28547
212.139.217.146 11695
212.139.217.146 11791
212.139.217.146 11807
212.139.217.146 11801
212.139.217.146 11812
212.139.217.146 11762
212.139.217.146 11776
212.139.217.146 11809
212.139.217.146 11811
212.139.217.146 11799
212.139.217.146 11900
93.24.229.80 20696
94.21.112.229 46570
124.6.181.195 30186
188.48.117.225 16814
81.234.250.180 28382
122.118.26.19 24793
178.90.16.213 23732
89.122.61.69 49001
46.158.127.89 57492
94.180.186.80 38312
92.149.49.162 7816
91.225.23.236 35691
68.118.94.35 33288
92.246.222.219 11335
99.70.88.225 43139
88.78.69.59 31441
90.148.148.73 34106
188.52.71.90 13213
85.210.38.111 20045
212.152.53.78 14254
115.23.249.109 16823
85.210.38.111 19724
67.162.186.239 28803
89.217.250.98 16190
85.210.38.111 19999
109.251.146.80 51027
92.149.49.162 7812
91.66.51.19 33548
84.41.72.126 49059
85.210.38.111 19915
178.117.36.48 26529
85.210.38.111 19730
91.202.134.248 54118
87.252.162.209 43996
24.55.87.176 27129
85.210.38.111 19739
85.210.38.111 19905
76.216.226.150 34974
85.210.38.111 19692
85.210.38.111 19893
85.210.38.111 20067
85.210.38.111 19831
85.210.38.111 20008
85.210.38.111 19883
85.210.38.111 20015
85.210.38.111 19984
85.210.38.111 19794
85.210.38.111 19972
85.210.38.111 19728
85.210.38.111 19766
85.210.38.111 19923
85.210.38.111 19997
85.210.38.111 19764
85.210.38.111 19900
85.210.38.111 19791
85.210.38.111 19970

View File

@ -120,7 +120,14 @@ void DhtWindow::updateDhtPeers()
foundstr << now - it->mFoundTime << " secs ago";
std::ostringstream lastsendstr;
lastsendstr << now - it->mLastSendTime << " secs ago";
if (it->mLastSendTime == 0)
{
lastsendstr << "never";
}
else
{
lastsendstr << now - it->mLastSendTime << " secs ago";
}
std::ostringstream lastrecvstr;
lastrecvstr << now - it->mLastRecvTime << " secs ago";

View File

@ -6,6 +6,12 @@ import random, os, stat
basePort = 20000;
ipaddr = '127.0.0.1';
nPeers = 30
nConnect = 20;
nGUIs = 3;
fBlockedDirect = 0.3;
fBlockedProxy = 0.1;
# for OSX.
#execpath = '../../PeerNetQt.app/Contents/MacOS/PeerNetQt';
# for Linux
@ -155,4 +161,4 @@ def makePeerConfig(folder, id):
tmpId = generatePeerId()
print tmpId;
generateNet('testpeernet', 30, 10, 0.3, 0.1, 3);
generateNet('testpeernet', nPeers, nConnect, fBlockedDirect, fBlockedProxy, nGUIs);

View File

@ -63,6 +63,7 @@ void MainWindow::update()
//std::cerr << "MainWindow::update()" << std::endl;
updateNetStatus();
updateNetPeers();
updateRelays();
updateChat();
// Shouldn't do it here! but for now.
@ -447,6 +448,129 @@ void MainWindow::updateNetPeers()
void MainWindow::updateRelays()
{
QTreeWidget *relayTreeWidget = ui->relayTreeWidget;
std::list<UdpRelayEnd> relayEnds;
std::list<UdpRelayProxy> relayProxies;
std::list<UdpRelayEnd>::iterator reit;
std::list<UdpRelayProxy>::iterator rpit;
std::list<std::string> failedPeerIds;
std::list<std::string>::iterator it;
mPeerNet->get_relayends(relayEnds);
mPeerNet->get_relayproxies(relayProxies);
#define RTW_COL_TYPE 0
#define RTW_COL_SRC 1
#define RTW_COL_PROXY 2
#define RTW_COL_DEST 3
#define RTW_COL_CLASS 4
#define RTW_COL_AGE 5
#define RTW_COL_LASTSEND 6
#define RTW_COL_BANDWIDTH 7
relayTreeWidget->clear();
time_t now = time(NULL);
for(reit = relayEnds.begin(); reit != relayEnds.end(); reit++)
{
/* find the entry */
QTreeWidgetItem *item = new QTreeWidgetItem();
relayTreeWidget->addTopLevelItem(item);
std::ostringstream typestr;
typestr << "RELAY END";
std::ostringstream srcstr;
srcstr << "Yourself";
std::ostringstream proxystr;
proxystr << rs_inet_ntoa(reit->mProxyAddr.sin_addr) << ":"
<< ntohs(reit->mProxyAddr.sin_port);
std::ostringstream deststr;
deststr << rs_inet_ntoa(reit->mRemoteAddr.sin_addr) << ":"
<< ntohs(reit->mRemoteAddr.sin_port);
std::ostringstream agestr;
agestr << "unknown";
std::ostringstream lastsendstr;
lastsendstr << "unknown";
std::ostringstream bandwidthstr;
bandwidthstr << "unlimited";
std::ostringstream classstr;
classstr << "Own Relay";
//std::ostringstream dhtupdatestr;
//dhtupdatestr << now - status.mDhtUpdateTS << " secs ago";
item -> setData(RTW_COL_TYPE, Qt::DisplayRole, QString::fromStdString(typestr.str()));
item -> setData(RTW_COL_SRC, Qt::DisplayRole, QString::fromStdString(srcstr.str()));
item -> setData(RTW_COL_PROXY, Qt::DisplayRole, QString::fromStdString(proxystr.str()));
item -> setData(RTW_COL_DEST, Qt::DisplayRole, QString::fromStdString(deststr.str()));
item -> setData(RTW_COL_CLASS, Qt::DisplayRole, QString::fromStdString(classstr.str()));
item -> setData(RTW_COL_AGE, Qt::DisplayRole, QString::fromStdString(agestr.str()));
item -> setData(RTW_COL_LASTSEND, Qt::DisplayRole, QString::fromStdString(lastsendstr.str()));
item -> setData(RTW_COL_BANDWIDTH, Qt::DisplayRole, QString::fromStdString(bandwidthstr.str()));
}
for(rpit = relayProxies.begin(); rpit != relayProxies.end(); rpit++)
{
/* find the entry */
QTreeWidgetItem *item = new QTreeWidgetItem();
relayTreeWidget->addTopLevelItem(item);
std::ostringstream typestr;
typestr << "RELAY PROXY";
std::ostringstream srcstr;
srcstr << rs_inet_ntoa(rpit->mAddrs.mSrcAddr.sin_addr) << ":"
<< ntohs(rpit->mAddrs.mSrcAddr.sin_port);
std::ostringstream proxystr;
proxystr << "Yourself";
std::ostringstream deststr;
deststr << rs_inet_ntoa(rpit->mAddrs.mDestAddr.sin_addr) << ":"
<< ntohs(rpit->mAddrs.mDestAddr.sin_port);
std::ostringstream agestr;
agestr << "unknown";
//agestr << now - rpit->mLastTS << " secs ago";
std::ostringstream lastsendstr;
lastsendstr << now - rpit->mLastTS << " secs ago";
std::ostringstream bandwidthstr;
bandwidthstr << rpit->mBandwidth << "B/s";
std::ostringstream classstr;
classstr << rpit->mRelayClass;
item -> setData(RTW_COL_TYPE, Qt::DisplayRole, QString::fromStdString(typestr.str()));
item -> setData(RTW_COL_SRC, Qt::DisplayRole, QString::fromStdString(srcstr.str()));
item -> setData(RTW_COL_PROXY, Qt::DisplayRole, QString::fromStdString(proxystr.str()));
item -> setData(RTW_COL_DEST, Qt::DisplayRole, QString::fromStdString(deststr.str()));
item -> setData(RTW_COL_CLASS, Qt::DisplayRole, QString::fromStdString(classstr.str()));
item -> setData(RTW_COL_AGE, Qt::DisplayRole, QString::fromStdString(agestr.str()));
item -> setData(RTW_COL_LASTSEND, Qt::DisplayRole, QString::fromStdString(lastsendstr.str()));
item -> setData(RTW_COL_BANDWIDTH, Qt::DisplayRole, QString::fromStdString(bandwidthstr.str()));
}
}
void MainWindow::addPeer()
{

View File

@ -21,6 +21,7 @@ public:
void updateNetStatus();
void updateNetPeers();
void updateRelays();
void updateChat();
void addChatMsg(std::string id, std::string msg);

View File

@ -17,7 +17,7 @@
<string>PeerNetQt</string>
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QVBoxLayout" name="verticalLayout_4">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
@ -210,6 +210,48 @@
</item>
</layout>
</widget>
<widget class="QTreeWidget" name="relayTreeWidget">
<column>
<property name="text">
<string>Relay Mode</string>
</property>
</column>
<column>
<property name="text">
<string>Source</string>
</property>
</column>
<column>
<property name="text">
<string>Proxy</string>
</property>
</column>
<column>
<property name="text">
<string>Destination</string>
</property>
</column>
<column>
<property name="text">
<string>Class</string>
</property>
</column>
<column>
<property name="text">
<string>Age</string>
</property>
</column>
<column>
<property name="text">
<string>Last Sent</string>
</property>
</column>
<column>
<property name="text">
<string>Bandwidth</string>
</property>
</column>
</widget>
</widget>
</item>
</layout>

View File

@ -505,6 +505,16 @@ int PeerNet::get_failedpeer_status(std::string id, PeerStatus &status)
return 0;
}
int PeerNet::get_relayends(std::list<UdpRelayEnd> &relayEnds)
{
mRelayReceiver->getRelayEnds(relayEnds);
}
int PeerNet::get_relayproxies(std::list<UdpRelayProxy> &relayProxies)
{
mRelayReceiver->getRelayProxies(relayProxies);
}
int PeerNet::get_dht_queries(std::map<bdNodeId, bdQueryStatus> &queries)
{

View File

@ -134,6 +134,9 @@ class PeerNet: public BitDhtCallback
int get_net_failedpeers(std::list<std::string> &peerIds);
int get_failedpeer_status(std::string peerId, PeerStatus &status);
int get_relayends(std::list<UdpRelayEnd> &relayEnds);
int get_relayproxies(std::list<UdpRelayProxy> &relayProxies);
/* remember peers */
int storePeers(std::string filepath);
int loadPeers(std::string filepath);