Merge pull request #6 from rohammer/master

* Speedtest raus genommen

data/clients.dat

@@ -0,0 +1,450 @@
+2017:03:30:10:50:01 436 224 212
+2017:03:30:10:55:02 458 231 227
+2017:03:30:11:00:01 441 219 222
+2017:03:30:11:05:01 459 230 229
+2017:03:30:11:10:01 466 229 237
+2017:03:30:11:15:01 432 210 222
+2017:03:30:11:20:01 457 214 243
+2017:03:30:11:25:01 447 226 221
+2017:03:30:11:30:01 475 226 249
+2017:03:30:11:35:01 442 226 216
+2017:03:30:11:40:02 497 240 257
+2017:03:30:11:45:01 464 227 237
+2017:03:30:11:50:01 459 219 240
+2017:03:30:11:55:01 490 223 267
+2017:03:30:12:00:01 444 210 234
+2017:03:30:12:05:01 500 232 268
+2017:03:30:12:10:02 466 231 235
+2017:03:30:12:15:02 514 251 263
+2017:03:30:12:20:01 496 243 253
+2017:03:30:12:25:01 510 240 270
+2017:03:30:12:30:01 487 225 262
+2017:03:30:12:35:01 495 238 257
+2017:03:30:12:40:01 477 229 248
+2017:03:30:12:45:01 527 241 286
+2017:03:30:12:50:01 455 215 240
+2017:03:30:12:55:01 479 221 258
+2017:03:30:13:00:01 503 233 270
+2017:03:30:13:05:02 487 252 235
+2017:03:30:13:10:01 571 305 266
+2017:03:30:13:15:01 533 297 236
+2017:03:30:13:20:01 586 310 276
+2017:03:30:13:25:01 480 252 228
+2017:03:30:13:30:01 490 226 264
+2017:03:30:13:35:01 481 230 251
+2017:03:30:13:40:02 480 225 255
+2017:03:30:13:45:01 463 223 240
+2017:03:30:13:50:01 485 224 261
+2017:03:30:13:55:02 477 233 244
+2017:03:30:14:00:02 505 227 278
+2017:03:30:14:05:02 487 232 255
+2017:03:30:14:10:01 485 243 242
+2017:03:30:14:15:01 511 250 261
+2017:03:30:14:20:01 454 222 232
+2017:03:30:14:25:02 481 204 277
+2017:03:30:14:30:01 476 225 251
+2017:03:30:14:35:01 516 244 272
+2017:03:30:14:40:02 474 239 235
+2017:03:30:14:45:01 502 246 256
+2017:03:30:14:50:01 473 242 231
+2017:03:30:14:55:01 539 280 259
+2017:03:30:15:00:01 478 248 230
+2017:03:30:15:05:01 529 281 248
+2017:03:30:15:10:02 486 256 230
+2017:03:30:15:15:02 557 279 278
+2017:03:30:15:20:01 508 261 247
+2017:03:30:15:25:01 549 272 277
+2017:03:30:15:30:01 480 245 235
+2017:03:30:15:35:01 545 275 270
+2017:03:30:15:40:02 525 282 243
+2017:03:30:15:45:02 507 257 250
+2017:03:30:15:50:01 568 279 289
+2017:03:30:15:55:02 523 256 267
+2017:03:30:16:00:02 582 279 303
+2017:03:30:16:05:02 514 276 238
+2017:03:30:16:10:01 562 298 264
+2017:03:30:16:15:01 564 306 258
+2017:03:30:16:20:01 580 301 279
+2017:03:30:16:25:02 536 296 240
+2017:03:30:16:30:02 572 301 271
+2017:03:30:16:35:02 585 315 270
+2017:03:30:16:40:01 558 307 251
+2017:03:30:16:45:01 604 305 299
+2017:03:30:16:50:01 529 276 253
+2017:03:30:16:55:01 580 291 289
+2017:03:30:17:00:01 583 307 276
+2017:03:30:17:05:01 600 309 291
+2017:03:30:17:10:01 549 287 262
+2017:03:30:17:15:02 594 310 284
+2017:03:30:17:20:01 583 302 281
+2017:03:30:17:25:01 553 288 265
+2017:03:30:17:30:01 600 298 302
+2017:03:30:17:35:01 534 287 247
+2017:03:30:17:40:01 598 314 284
+2017:03:30:17:45:01 594 319 275
+2017:03:30:17:50:01 557 315 242
+2017:03:30:17:55:01 626 337 289
+2017:03:30:18:00:01 556 316 240
+2017:03:30:18:05:01 600 335 265
+2017:03:30:18:10:01 609 348 261
+2017:03:30:18:15:01 614 356 258
+2017:03:30:18:20:01 599 352 247
+2017:03:30:18:25:02 612 352 260
+2017:03:30:18:30:01 550 332 218
+2017:03:30:18:35:01 585 326 259
+2017:03:30:18:40:01 594 334 260
+2017:03:30:18:45:02 635 368 267
+2017:03:30:18:50:01 606 350 256
+2017:03:30:18:55:01 648 355 293
+2017:03:30:19:00:02 594 354 240
+2017:03:30:19:05:02 634 358 276
+2017:03:30:19:10:01 570 342 228
+2017:03:30:19:15:01 575 334 241
+2017:03:30:19:20:01 559 327 232
+2017:03:30:19:25:01 568 325 243
+2017:03:30:19:30:02 525 319 206
+2017:03:30:19:35:01 516 297 219
+2017:03:30:19:40:01 549 325 224
+2017:03:30:19:45:01 512 303 209
+2017:03:30:19:50:01 539 313 226
+2017:03:30:19:55:01 501 310 191
+2017:03:30:20:00:01 527 313 214
+2017:03:30:20:05:01 486 303 183
+2017:03:30:20:10:01 529 335 194
+2017:03:30:20:15:01 543 329 214
+2017:03:30:20:20:01 513 325 188
+2017:03:30:20:25:02 518 326 192
+2017:03:30:20:30:01 523 323 200
+2017:03:30:20:35:01 493 312 181
+2017:03:30:20:40:01 504 314 190
+2017:03:30:20:45:01 451 281 170
+2017:03:30:20:50:01 479 290 189
+2017:03:30:20:55:01 462 290 172
+2017:03:30:21:00:01 461 281 180
+2017:03:30:21:05:01 479 297 182
+2017:03:30:21:10:01 486 297 189
+2017:03:30:21:15:01 442 268 174
+2017:03:30:21:20:01 425 241 184
+2017:03:30:21:25:01 411 249 162
+2017:03:30:21:30:02 427 254 173
+2017:03:30:21:35:01 399 238 161
+2017:03:30:21:40:02 427 254 173
+2017:03:30:21:45:01 394 232 162
+2017:03:30:21:50:01 422 242 180
+2017:03:30:21:55:01 412 239 173
+2017:03:30:22:00:01 420 230 190
+2017:03:30:22:05:02 405 230 175
+2017:03:30:22:10:01 414 236 178
+2017:03:30:22:15:01 421 238 183
+2017:03:30:22:20:02 404 221 183
+2017:03:30:22:25:01 414 222 192
+2017:03:30:22:30:01 352 204 148
+2017:03:30:22:35:02 378 216 162
+2017:03:30:22:40:02 347 204 143
+2017:03:30:22:45:01 361 206 155
+2017:03:30:22:50:01 330 187 143
+2017:03:30:22:55:01 347 196 151
+2017:03:30:23:00:01 316 169 147
+2017:03:30:23:05:01 347 193 154
+2017:03:30:23:10:01 317 185 132
+2017:03:30:23:15:01 323 185 138
+2017:03:30:23:20:01 319 187 132
+2017:03:30:23:25:01 333 192 141
+2017:03:30:23:30:02 300 179 121
+2017:03:30:23:35:01 320 184 136
+2017:03:30:23:40:01 302 179 123
+2017:03:30:23:45:01 319 187 132
+2017:03:30:23:50:01 308 185 123
+2017:03:30:23:55:01 305 181 124
+2017:03:31:00:00:01 300 184 116
+2017:03:31:00:05:01 315 189 126
+2017:03:31:00:10:01 285 166 119
+2017:03:31:00:15:01 297 177 120
+2017:03:31:00:20:01 299 183 116
+2017:03:31:00:25:01 282 168 114
+2017:03:31:00:30:01 277 166 111
+2017:03:31:00:35:01 277 162 115
+2017:03:31:00:40:01 288 171 117
+2017:03:31:00:45:01 278 165 113
+2017:03:31:00:50:02 279 165 114
+2017:03:31:00:55:02 279 169 110
+2017:03:31:01:00:02 280 166 114
+2017:03:31:01:05:01 264 162 102
+2017:03:31:01:10:02 275 166 109
+2017:03:31:01:15:01 268 166 102
+2017:03:31:01:20:01 276 170 106
+2017:03:31:01:25:02 269 162 107
+2017:03:31:01:30:02 270 162 108
+2017:03:31:01:35:03 257 155 102
+2017:03:31:01:40:01 272 164 108
+2017:03:31:01:45:02 263 159 104
+2017:03:31:01:50:01 281 174 107
+2017:03:31:01:55:02 270 165 105
+2017:03:31:02:00:02 280 173 107
+2017:03:31:02:05:01 259 158 101
+2017:03:31:02:10:01 262 159 103
+2017:03:31:02:15:01 258 157 101
+2017:03:31:02:20:01 267 160 107
+2017:03:31:02:25:01 259 154 105
+2017:03:31:02:30:01 268 160 108
+2017:03:31:02:35:01 253 151 102
+2017:03:31:02:40:01 270 163 107
+2017:03:31:02:45:01 248 150 98
+2017:03:31:02:50:01 257 155 102
+2017:03:31:02:55:01 246 151 95
+2017:03:31:03:00:02 256 154 102
+2017:03:31:03:05:01 246 147 99
+2017:03:31:03:10:01 265 157 108
+2017:03:31:03:15:01 241 144 97
+2017:03:31:03:20:01 253 151 102
+2017:03:31:03:25:01 252 155 97
+2017:03:31:03:30:01 260 156 104
+2017:03:31:03:35:02 255 158 97
+2017:03:31:03:40:01 258 153 105
+2017:03:31:03:45:02 249 149 100
+2017:03:31:03:50:01 248 152 96
+2017:03:31:03:55:01 250 149 101
+2017:03:31:04:00:01 234 139 95
+2017:03:31:04:05:02 244 148 96
+2017:03:31:04:10:01 253 156 97
+2017:03:31:04:15:02 238 143 95
+2017:03:31:04:20:01 245 149 96
+2017:03:31:04:25:01 236 142 94
+2017:03:31:04:30:02 248 149 99
+2017:03:31:04:35:01 250 155 95
+2017:03:31:04:40:01 261 163 98
+2017:03:31:04:45:01 241 148 93
+2017:03:31:04:50:01 255 156 99
+2017:03:31:04:55:01 247 150 97
+2017:03:31:05:00:01 257 151 106
+2017:03:31:05:05:01 247 146 101
+2017:03:31:05:10:02 264 156 108
+2017:03:31:05:15:01 260 156 104
+2017:03:31:05:20:01 272 162 110
+2017:03:31:05:25:02 261 161 100
+2017:03:31:05:30:01 266 157 109
+2017:03:31:05:35:02 271 160 111
+2017:03:31:05:40:01 280 168 112
+2017:03:31:05:45:01 271 152 119
+2017:03:31:05:50:01 273 150 123
+2017:03:31:05:55:02 274 151 123
+2017:03:31:06:00:02 292 160 132
+2017:03:31:06:05:02 281 158 123
+2017:03:31:06:10:01 294 170 124
+2017:03:31:06:15:01 293 169 124
+2017:03:31:06:20:02 300 172 128
+2017:03:31:06:25:01 293 170 123
+2017:03:31:06:30:02 326 189 137
+2017:03:31:06:35:02 308 177 131
+2017:03:31:06:40:02 328 180 148
+2017:03:31:06:45:01 319 179 140
+2017:03:31:06:50:01 332 188 144
+2017:03:31:06:55:01 332 185 147
+2017:03:31:07:00:01 365 207 158
+2017:03:31:07:05:01 353 216 137
+2017:03:31:07:10:01 382 220 162
+2017:03:31:07:15:02 368 215 153
+2017:03:31:07:20:02 366 201 165
+2017:03:31:07:25:02 388 203 185
+2017:03:31:07:30:01 355 201 154
+2017:03:31:07:35:02 391 216 175
+2017:03:31:07:40:01 371 211 160
+2017:03:31:07:45:02 434 239 195
+2017:03:31:07:50:02 437 248 189
+2017:03:31:07:55:01 441 251 190
+2017:03:31:08:00:02 432 256 176
+2017:03:31:08:05:01 363 203 160
+2017:03:31:08:10:02 389 201 188
+2017:03:31:08:15:02 364 200 164
+2017:03:31:08:20:01 371 197 174
+2017:03:31:08:25:02 364 205 159
+2017:03:31:08:30:02 393 209 184
+2017:03:31:08:35:01 379 201 178
+2017:03:31:08:40:01 358 198 160
+2017:03:31:08:45:01 401 208 193
+2017:03:31:08:50:01 394 204 190
+2017:03:31:08:55:01 431 212 219
+2017:03:31:09:00:01 470 225 245
+2017:03:31:09:05:01 420 225 195
+2017:03:31:09:10:01 447 235 212
+2017:03:31:09:15:01 327 222 105
+2017:03:31:09:20:02 421 235 186
+2017:03:31:09:25:01 414 229 185
+2017:03:31:09:30:03 442 230 212
+2017:03:31:09:35:02 422 226 196
+2017:03:31:09:40:02 440 229 211
+2017:03:31:09:45:02 406 223 183
+2017:03:31:09:50:01 450 233 217
+2017:03:31:09:55:01 439 233 206
+2017:03:31:10:00:02 467 238 229
+2017:03:31:10:05:02 458 230 228
+2017:03:31:10:10:02 443 235 208
+2017:03:31:10:15:02 446 236 210
+2017:03:31:10:20:01 417 224 193
+2017:03:31:10:25:01 454 234 220
+2017:03:31:10:30:02 404 209 195
+2017:03:31:10:35:01 440 213 227
+2017:03:31:10:40:02 425 212 213
+2017:03:31:10:45:01 470 230 240
+2017:03:31:10:50:02 426 210 216
+2017:03:31:10:55:02 471 220 251
+2017:03:31:11:00:02 423 208 215
+2017:03:31:11:05:01 456 228 228
+2017:03:31:11:10:01 413 217 196
+2017:03:31:11:15:02 431 223 208
+2017:03:31:11:20:01 410 213 197
+2017:03:31:11:25:01 445 217 228
+2017:03:31:11:30:01 441 224 217
+2017:03:31:11:35:01 504 253 251
+2017:03:31:11:40:01 433 225 208
+2017:03:31:11:45:01 475 232 243
+2017:03:31:11:50:01 449 233 216
+2017:03:31:11:55:02 471 229 242
+2017:03:31:12:00:01 470 233 237
+2017:03:31:12:05:01 502 252 250
+2017:03:31:12:10:01 483 249 234
+2017:03:31:12:15:01 494 239 255
+2017:03:31:12:20:01 460 224 236
+2017:03:31:12:25:01 501 232 269
+2017:03:31:12:30:01 451 224 227
+2017:03:31:12:35:02 481 221 260
+2017:03:31:12:40:01 502 241 261
+2017:03:31:12:45:01 512 243 269
+2017:03:31:12:50:01 452 226 226
+2017:03:31:12:55:01 494 232 262
+2017:03:31:13:00:01 457 237 220
+2017:03:31:13:05:01 530 267 263
+2017:03:31:13:10:02 549 311 238
+2017:03:31:13:15:01 574 311 263
+2017:03:31:13:20:02 547 294 253
+2017:03:31:13:25:01 506 262 244
+2017:03:31:13:30:01 508 244 264
+2017:03:31:13:35:01 505 267 238
+2017:03:31:13:40:02 563 299 264
+2017:03:31:13:45:02 569 331 238
+2017:03:31:13:50:01 611 323 288
+2017:03:31:13:55:01 485 250 235
+2017:03:31:14:00:01 484 255 229
+2017:03:31:14:05:01 520 264 256
+2017:03:31:14:10:01 484 255 229
+2017:03:31:14:15:01 508 255 253
+2017:03:31:14:20:01 500 251 249
+2017:03:31:14:25:01 498 237 261
+2017:03:31:14:30:01 431 218 213
+2017:03:31:14:35:01 456 231 225
+2017:03:31:14:40:01 494 247 247
+2017:03:31:14:45:01 489 254 235
+2017:03:31:14:50:01 473 227 246
+2017:03:31:14:55:01 538 269 269
+2017:03:31:15:00:01 491 264 227
+2017:03:31:15:05:01 538 282 256
+2017:03:31:15:10:02 525 274 251
+2017:03:31:15:15:02 549 258 291
+2017:03:31:15:20:01 546 269 277
+2017:03:31:15:25:01 552 273 279
+2017:03:31:15:30:01 552 281 271
+2017:03:31:15:35:01 530 267 263
+2017:03:31:15:40:01 540 271 269
+2017:03:31:15:45:01 554 272 282
+2017:03:31:15:50:01 535 273 262
+2017:03:31:15:55:01 557 274 283
+2017:03:31:16:00:01 502 258 244
+2017:03:31:16:05:01 561 274 287
+2017:03:31:16:10:01 525 267 258
+2017:03:31:16:15:01 546 257 289
+2017:03:31:16:20:01 510 254 256
+2017:03:31:16:25:01 547 256 291
+2017:03:31:16:30:01 511 264 247
+2017:03:31:16:35:01 548 275 273
+2017:03:31:16:40:02 524 268 256
+2017:03:31:16:45:01 563 267 296
+2017:03:31:16:50:02 530 274 256
+2017:03:31:16:55:01 573 291 282
+2017:03:31:17:00:01 524 281 243
+2017:03:31:17:05:01 564 275 289
+2017:03:31:17:10:01 545 275 270
+2017:03:31:17:15:01 593 299 294
+2017:03:31:17:20:01 554 285 269
+2017:03:31:17:25:01 617 298 319
+2017:03:31:17:30:02 565 289 276
+2017:03:31:17:35:03 539 294 245
+2017:03:31:17:40:02 582 301 281
+2017:03:31:17:45:01 543 298 245
+2017:03:31:17:50:01 558 294 264
+2017:03:31:17:55:01 593 305 288
+2017:03:31:18:00:02 535 293 242
+2017:03:31:18:05:02 600 330 270
+2017:03:31:18:10:01 550 313 237
+2017:03:31:18:15:01 610 333 277
+2017:03:31:18:20:01 524 275 249
+2017:03:31:18:25:02 601 313 288
+2017:03:31:18:30:02 545 313 232
+2017:03:31:18:35:02 526 300 226
+2017:03:31:18:40:02 564 306 258
+2017:03:31:18:45:01 538 289 249
+2017:03:31:18:50:01 576 303 273
+2017:03:31:18:55:02 547 310 237
+2017:03:31:19:00:01 603 331 272
+2017:03:31:19:05:01 586 330 256
+2017:03:31:19:10:01 555 317 238
+2017:03:31:19:15:02 585 317 268
+2017:03:31:19:20:01 553 329 224
+2017:03:31:19:25:01 589 334 255
+2017:03:31:19:30:01 543 313 230
+2017:03:31:19:35:01 561 306 255
+2017:03:31:19:40:01 512 307 205
+2017:03:31:19:45:01 542 315 227
+2017:03:31:19:50:01 498 328 170
+2017:03:31:19:55:01 541 343 198
+2017:03:31:20:00:01 518 333 185
+2017:03:31:20:05:08 520 325 195
+2017:03:31:20:10:01 422 280 142
+2017:03:31:20:15:01 516 314 202
+2017:03:31:20:20:01 549 341 208
+2017:03:31:20:25:02 483 300 183
+2017:03:31:20:30:02 518 319 199
+2017:03:31:20:35:01 490 293 197
+2017:03:31:20:40:01 539 328 211
+2017:03:31:20:45:01 501 292 209
+2017:03:31:20:50:01 557 330 227
+2017:03:31:20:55:01 519 305 214
+2017:03:31:21:00:01 530 318 212
+2017:03:31:21:05:01 520 316 204
+2017:03:31:21:10:01 498 303 195
+2017:03:31:21:15:01 491 299 192
+2017:03:31:21:20:02 459 287 172
+2017:03:31:21:25:01 497 308 189
+2017:03:31:21:30:02 482 314 168
+2017:03:31:21:35:01 455 291 164
+2017:03:31:21:40:02 478 293 185
+2017:03:31:21:45:01 472 294 178
+2017:03:31:21:50:02 450 290 160
+2017:03:31:21:55:01 453 292 161
+2017:03:31:22:00:01 432 275 157
+2017:03:31:22:05:01 458 289 169
+2017:03:31:22:10:01 429 275 154
+2017:03:31:22:15:01 444 278 166
+2017:03:31:22:20:01 431 276 155
+2017:03:31:22:25:01 441 272 169
+2017:03:31:22:30:01 402 245 157
+2017:03:31:22:35:01 430 258 172
+2017:03:31:22:40:01 406 235 171
+2017:03:31:22:45:01 436 259 177
+2017:03:31:22:50:01 387 244 143
+2017:03:31:22:55:02 385 246 139
+2017:03:31:23:00:01 391 245 146
+2017:03:31:23:05:01 350 216 134
+2017:03:31:23:10:01 386 237 149
+2017:03:31:23:15:02 368 229 139
+2017:03:31:23:20:02 383 243 140
+2017:03:31:23:25:02 365 233 132
+2017:03:31:23:30:01 355 222 133
+2017:03:31:23:35:03 337 211 126
+2017:03:31:23:40:01 341 213 128
+2017:03:31:23:45:01 336 208 128
+2017:03:31:23:50:02 360 225 135
+2017:03:31:23:55:01 331 204 127
+2017:04:01:00:00:01 347 213 134
+2017:04:01:00:05:01 333 208 125
+2017:04:01:00:10:02 325 197 128
+2017:04:01:00:15:01 316 194 122

html/responsive-menu.html

@@ -185,8 +185,14 @@
                             </ul></li>
                         <li><a href="#">Router via l2tp</a>
                             <ul>
-                                <li><a href="routers.php">has-sued</a></li>
+                                <li><a href="routers-l2tp.php">has-sued</a></li>
-                                <li><a href="#">has (geht noch net)</a></li>
+                                <li><a href="routers-l2tp-has.php">has</a></li>
+                            </ul></li>
+
+                        <li><a href="#">Router via fastd</a>
+                            <ul>
+                                <li><a href="routers-fastd.php">has-sued</a></li>
+                                <li><a href="routers-fastd-has.php">has</a></li>
                             </ul></li>
                     </ul>
                 </nav>

html/routers-fastd-has.html

@@ -0,0 +1,19 @@
+<div id="content">
+<H2>Router via fastd in der has-hood</H2>
+
+<?php
+$routers = file_get_contents('http://5.189.166.50/fastd_routers');
+$router = explode(PHP_EOL, $routers);
+for($i = 0; $i < count($router); ++$i) {
+        echo "<a href=\"https://monitoring.freifunk-franken.de/routers?q=^$router[$i]\$\">$router[$i]</a><br>";
+}
+--$i;
+echo "<br>fastd Router has-sued: $i"
+?>
+
+</div>
+</div></div>
+</div></div></div>
+</body>
+</html>
+

html/routers-fastd.html

@@ -0,0 +1,19 @@
+<div id="content">
+<H2>Router via fastd in der has-sued</H2>
+
+<?php
+$routers = shell_exec('sudo /var/www/html/has-mon/sensors/fastd-routers.sh');
+$router = explode(PHP_EOL, $routers);
+for($i = 0; $i < count($router); ++$i) {
+        echo "<a href=\"https://monitoring.freifunk-franken.de/routers?q=^$router[$i]\$\">$router[$i]</a><br>";
+}
+--$i;
+echo "<br>fastd Router has-sued: $i"
+?>
+
+</div>
+</div></div>
+</div></div></div>
+</body>
+</html>
+

html/routers-l2tp-has.html

@@ -0,0 +1,19 @@
+<div id="content">
+<H2>Router via l2tp in der has-hood</H2>
+
+<?php
+$routers = file_get_contents('http://5.189.166.50/l2tp_routers');
+$router = explode(PHP_EOL, $routers);
+for($i = 0; $i < count($router); ++$i) {
+        echo "<a href=\"https://monitoring.freifunk-franken.de/routers?q=^$router[$i]\$\">$router[$i]</a><br>";
+}
+--$i;
+echo "<br>l2tp Router has-sued: $i"
+?>
+
+</div>
+</div></div>
+</div></div></div>
+</body>
+</html>
+

html/routers.html

@@ -1,5 +1,5 @@
 <div id="content">
-<H1>Router via l2tp in der has-sued</H1>
+<H2>Router via l2tp in der has-sued</H2>
 
 <?php
 $routers = shell_exec('sudo -n /var/www/html/has-mon/sensors/l2tp-routers.sh');

html/start.html

@@ -2,14 +2,21 @@
 <div id="content">
 <?php
 $hostname = gethostname();
-echo "<h1 align=center>FFF Gateway $hostname</h1>";
+echo "<h2 align=center>Hoods: has und has-süd </h2>";
-echo "<p align=center>Hoods: has und has-süd";
 ?>
 
 <div class="ampel">
 <?php
 $l2tp = shell_exec('ip l | grep -c l2tp');
-echo "<b>Anzahl der l2tp Tunnel</b><br>has-sued: <b>$l2tp</b><br><br>";
+$fastd = shell_exec('sudo /var/www/html/has-mon/sensors/fastd-routers.sh | sort | uniq | wc -l');
+echo "<b>Anzahl der VPN-Router has-sued:</b><br>via l2tp: $l2tp<br>via fastd: $fastd<br><br>";
+
+
+$l2tps = file_get_contents('http://5.189.166.50/l2tp_routers');
+$fastds = file_get_contents('http://5.189.166.50/fastd_routers');
+$l2tp = str_word_count($l2tps);
+$fastd = str_word_count($fastds);
+echo "<b>Anzahl der VPN-Router has:</b><br>via l2tp: $l2tp<br>via fastd: $fastd<br><br>";
 
 $gwselsued = file_get_contents('http://10.50.60.22/bat0.dat');
 $gwselhas = file_get_contents('http://10.50.60.22/bat2.dat');
@@ -35,8 +42,8 @@ echo $clients;
 
 <div class=mrtg>
 
-<b>Speedtest has und has-sued (Kabel, wr-841, l2tp)</b>
+<b>Clients in has und has-sued</b>
-<img  src="http://163.172.161.233/top/img/speed.png"> 
+<img src="img/clients.png">
 
 <hr />
 
@@ -50,8 +57,9 @@ echo $clients;
 <b>GW has2</b>
 <img  src="http://5.189.166.50/localhost_eth0-day.png">
 
-<br><b>GW has3 - kein mrtg</b><br>
+<br><b>GW has3</b><br>
-
+<img src="http://213.136.93.106/localhost_eth0-day.png">
+ 
 <b>GW roffl</b>
 <img  src="http://5.189.142.26/localhost_eth0-day.png">
 

routers-fastd-has.php

@@ -0,0 +1,6 @@
+<?php
+include 'html/responsive-menu.html';
+include 'html/routers-fastd-has.html';
+?>
+
+

routers-fastd.php

@@ -0,0 +1,6 @@
+<?php
+include 'html/responsive-menu.html';
+include 'html/routers-fastd.html';
+?>
+
+

routers-l2tp-has.php

@@ -0,0 +1,6 @@
+<?php
+include 'html/responsive-menu.html';
+include 'html/routers-l2tp-has.html';
+?>
+
+

sensors/clients.pl

@@ -0,0 +1,24 @@
+#!/usr/bin/gnuplot
+reset
+#set terminal png
+set terminal png size 800,400 font ",10"
+set output '/var/www/html/has-mon/img/clients.png'
+set xdata time
+set timefmt "%Y:%m:%d:%H:%M:%S"
+set format x "%H:%M"
+#set xlabel "time"
+
+set ylabel "Clients"
+set yrange [0:670]
+
+#set title "Clients "
+#set key center bmargin  font ",10"
+set key horizontal reverse samplen 1 width -1 maxrows 1
+set grid
+
+set style data lines
+
+plot "/var/www/html/has-mon/data/clients.dat" using 1:2 title "ges", \
+"" using 1:3 title "Hassberge", \
+"" using 1:4 title "Hassberge Sued", \
+#

sensors/clients.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+#get the file from has2
+wget -O /tmp/clients http://5.189.166.50/test.html
+
+date=$(date +%Y:%m:%d:%H:%M:%S)
+
+all=$(grep Clients /tmp/clients | cut -f 2 -d" " | cut -f1 -d"<")
+has=$(grep Hassberge: /tmp/clients | cut -f 2 -d" " | cut -f1 -d"<")
+sued=$(grep Sued /tmp/clients | cut -f 3 -d" " | cut -f1 -d"<")
+
+echo "$date $all $has $sued" >> /var/www/html/has-mon/data/clients.dat
+# dat länge begrenzen
+tail -450 /var/www/html/has-mon/data/clients.dat > /tmp/clients.dat
+grep -v ^$ /tmp/clients.dat > /var/www/html/has-mon/data/clients.dat
+
+/var/www/html/has-mon/sensors/clients.pl

sensors/fastd-routers.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+port=10001
+hood=hbergsued
+
+for ip in $(tcpdump -n -i  eth0 udp port $port -c 500 2>/dev/null | cut -f 3 -d " " | sort -n | uniq | grep -v 1000 | cut -f 1-4 -d .); do 
+	grep -3 $ip /etc/fastd/fff.$hood/peers/* | grep name | cut -f2 -d\"  
+done | grep -v netmon

sensors/l2tp-routers.sh

@@ -4,9 +4,11 @@
 
 
 ips=$(ip l2 s tunnel | awk '/From/  {print $4}')
-	journalctl -u tunneldigger-broker-sued.service > /tmp/td.log
+#journalctl -u tunneldigger-broker-sued.service > /tmp/td.log
+cat /var/log/syslog /var/log/syslog.1 | grep tunneldigger  | grep Creating > /tmp/td.log
+zcat /var/log/syslog.?.gz | grep tunneldigger  | grep Creating >> /tmp/td.log
 for ip in $ips; do
 	rname="$rname$(grep $ip /tmp/td.log | awk '/Creating/ {gsub ("\\(","");gsub ("\\)",""); print $10"\\n"}')" 
 done
 
-echo -e $rname | grep -v ^" " | uniq | sort -f
+echo -e $rname | grep -v ^" " | uniq | sort -f | uniq