diff --git a/tools/httpd_sim.c b/tools/httpd_sim.c index 625894d..138faa9 100644 --- a/tools/httpd_sim.c +++ b/tools/httpd_sim.c @@ -15,7 +15,15 @@ #define PASSWORD "1234" #define SESSION_TIMEOUT 2000 -#define PORTS 6 +#define PORTS 9 +#define NSFP 1 + +#if PORTS == 9 +const uint8_t physToLogPort[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8}; +#else +const uint8_t physToLogPort[] = { 4, 5, 6, 7, 3, 8}; +#endif + time_t last_called; time_t last_session_use; @@ -125,7 +133,8 @@ void send_status(int s) for (int i = 1; i <= PORTS; i++) { v = json_object_new_object(); json_object_object_add(v, "portNum", json_object_new_int(i)); - json_object_object_add(v, "isSFP", json_object_new_int(i < 5 ? 0 : 1)); + json_object_object_add(v, "logPort", json_object_new_int(physToLogPort[i-1])); + json_object_object_add(v, "isSFP", json_object_new_int(i <= PORTS - NSFP ? 0 : 1)); json_object_object_add(v, "enabled", json_object_new_int((i % 4) ? 1 : 0)); json_object_object_add(v, "link", json_object_new_int(i % 2 ? ((i == 1)? 5 : 2) : 0)); if (i % 2) { @@ -143,7 +152,7 @@ void send_status(int s) json_object_object_add(v, "txB", json_object_new_string(txB_buff)); json_object_object_add(v, "rxG", json_object_new_string(rxG_buff)); json_object_object_add(v, "rxB", json_object_new_string(rxB_buff)); - if (i >= 5) { + if (i >= PORTS - NSFP) { uint16_t temp = 0x28fb + rand() / (RAND_MAX / 100); uint16_t vcc = 0x7eda + rand() / (RAND_MAX / 100); uint16_t txbias = 0x0d24 +rand() / (RAND_MAX / 100); @@ -169,6 +178,14 @@ void send_status(int s) json_object_object_add(v, "sfp_txpower", json_object_new_string(sfp_txpower)); json_object_object_add(v, "sfp_rxpower", json_object_new_string(sfp_rxpower)); json_object_object_add(v, "sfp_laser", json_object_new_string(sfp_laser)); + } else { + if (i == 1) + json_object_object_add(v, "adv", json_object_new_string("100000")); + else if (i==2) + json_object_object_add(v, "adv", json_object_new_string("000011")); + else + json_object_object_add(v, "adv", json_object_new_string("000100")); + } json_object_array_add(ports, v); }