+2

GNUmakefile

reviewed

··· 6 6 BUILD_ROOT = $(CURDIR)/obj 7 7 EXCLUDE_DIRS = $(BUILD_ROOT) 8 8 9 9 + LIBS = Syslog 10 10 + 9 11 ESP_ROOT = /usr/local/share/arduino/hardware/espressif/esp8266 10 12 ARDUINO_ROOT = /usr/local/share/arduino 11 13 ARDUINO_LIBS = ${ESP_ROOT}/libraries

+14

util.cpp

reviewed

··· 21 21 22 22 bool serial_alive = true; 23 23 24 24 + WiFiUDP syslogUDPClient; 25 25 + Syslog syslog(syslogUDPClient, SYSLOG_PROTO_BSD); 26 26 + 24 27 void 25 28 setup(void) 26 29 { ··· 58 61 EEPROM.commit(); 59 62 } 60 63 64 64 + syslog_setup(); 65 65 + 61 66 Serial.begin(settings->baud); 62 67 delay(1000); 63 68 ··· 71 76 WiFi.disconnect(); 72 77 else 73 78 WiFi.begin(settings->wifi_ssid, settings->wifi_pass); 79 79 + } 80 80 + 81 81 + void 82 82 + syslog_setup(void) 83 83 + { 84 84 + if (settings->syslog_server[0]) 85 85 + syslog.server(settings->syslog_server, 514); 86 86 + else 87 87 + syslog.server(NULL, 514); 74 88 } 75 89 76 90 void

+5

wifippp.h

reviewed

··· 21 21 #include <Arduino.h> 22 22 #include <EEPROM.h> 23 23 #include <ESP8266WiFi.h> 24 24 + #include <Syslog.h> 25 25 + #include <WiFiUdp.h> 24 26 25 27 #define WIFISTATION_VERSION "0.5" 26 28 ··· 40 42 #define BOOKMARK_SIZE 64 41 43 #define NUM_BOOKMARKS 3 42 44 char bookmarks[NUM_BOOKMARKS][BOOKMARK_SIZE]; 45 45 + char syslog_server[64]; 43 46 }; 44 47 45 48 extern struct eeprom_data *settings; 49 49 + extern Syslog syslog; 46 50 47 51 #define MAX_UPLOAD_SIZE (16 * 1024) 48 52 ··· 54 58 extern bool serial_alive; 55 59 56 60 /* util.cpp */ 61 61 + void syslog_setup(void); 57 62 void led_setup(void); 58 63 void led_reset(void); 59 64 void error_flash(void);

+15

wifippp.ino

reviewed

··· 288 288 outputf("DNS server IP: %s\r\n", 289 289 WiFi.dnsIP().toString().c_str()); 290 290 } 291 291 + outputf("Syslog server: %s\r\n", 292 292 + settings->syslog_server); 291 293 for (int i = 0; i < NUM_BOOKMARKS; i++) { 292 294 if (settings->bookmarks[i][0] != '\0') 293 295 outputf("ATDS bookmark %d: %s\r\n", ··· 429 431 } else if (strcmp(lcmd, "at$ssid?") == 0) { 430 432 /* AT$SSID?: print wifi ssid */ 431 433 outputf("%s\r\nOK\r\n", settings->wifi_ssid); 434 434 + } else if (strncmp(lcmd, "at$syslog=", 10) == 0) { 435 435 + /* AT$SYSLOG=...: set syslog server */ 436 436 + memset(settings->syslog_server, 0, 437 437 + sizeof(settings->syslog_server)); 438 438 + strncpy(settings->syslog_server, cmd + 10, 439 439 + sizeof(settings->syslog_server)); 440 440 + output("OK\r\n"); 441 441 + syslog_setup(); 442 442 + syslog.logf(LOG_INFO, "syslog server changed to %s", 443 443 + settings->syslog_server); 444 444 + } else if (strcmp(lcmd, "at$syslog?") == 0) { 445 445 + /* AT$SYSLOG?: print syslog server */ 446 446 + outputf("%s\r\nOK\r\n", settings->syslog_server); 432 447 } else if (strncmp(lcmd, "at$tts=", 7) == 0) { 433 448 /* AT$TTS=: set telnet NAWS */ 434 449 int w, h, chars;