mirror of
https://github.com/logicog/RTLPlayground.git
synced 2026-10-29 17:54:14 +08:00
syslog: take the review notes on the state flag and the header length
The enabled flag is a flag, so say bool. The header length no longer needs to live in xdata: it was put there when a local would not link, and there is room for it here. The overview names the row after the JSON key, so the syslog row said "syslog_server_ip" while carrying only an address. It now says "syslog_server" and carries the port with it.
This commit is contained in:
1 parent
e50d3c6950
commit
40ce742d04
3 files changed
+6
-8
No files matched your search
+3
-2
@@ -221,11 +221,12 @@ void send_basic_info(void)
|
|||||||
itoa_html(uip_netmask[0] >> 8); char_to_html('.');
|
itoa_html(uip_netmask[0] >> 8); char_to_html('.');
|
||||||
itoa_html(uip_netmask[1]); char_to_html('.');
|
itoa_html(uip_netmask[1]); char_to_html('.');
|
||||||
itoa_html(uip_netmask[1] >> 8);
|
itoa_html(uip_netmask[1] >> 8);
|
||||||
slen += strtox(outbuf + slen, "\",\"syslog_server_ip\":\"");
|
slen += strtox(outbuf + slen, "\",\"syslog_server\":\"");
|
||||||
itoa_html(syslog_state.server_ip[0]); char_to_html('.');
|
itoa_html(syslog_state.server_ip[0]); char_to_html('.');
|
||||||
itoa_html(syslog_state.server_ip[1]); char_to_html('.');
|
itoa_html(syslog_state.server_ip[1]); char_to_html('.');
|
||||||
itoa_html(syslog_state.server_ip[2]); char_to_html('.');
|
itoa_html(syslog_state.server_ip[2]); char_to_html('.');
|
||||||
itoa_html(syslog_state.server_ip[3]);
|
itoa_html(syslog_state.server_ip[3]); char_to_html(':');
|
||||||
|
itoa_html(syslog_state.server_port);
|
||||||
slen += strtox(outbuf + slen, "\",\"mac_address\":\"");
|
slen += strtox(outbuf + slen, "\",\"mac_address\":\"");
|
||||||
byte_to_html(uip_ethaddr.addr[0]); char_to_html(':');
|
byte_to_html(uip_ethaddr.addr[0]); char_to_html(':');
|
||||||
byte_to_html(uip_ethaddr.addr[1]); char_to_html(':');
|
byte_to_html(uip_ethaddr.addr[1]); char_to_html(':');
|
||||||
|
|||||||
@@ -12,11 +12,6 @@ __xdata char logbuf[LOGBUF_SIZE];
|
|||||||
__xdata struct syslog_state syslog_state;
|
__xdata struct syslog_state syslog_state;
|
||||||
__xdata uip_ipaddr_t server_ip;
|
__xdata uip_ipaddr_t server_ip;
|
||||||
|
|
||||||
/* Header length, in xdata rather than on the stack: syslog_callback() is
|
|
||||||
* __banked, so a local here takes a byte of internal RAM nobody can overlay,
|
|
||||||
* and the two it costs are enough to stop the image from linking. */
|
|
||||||
__xdata uint16_t syslog_hdr;
|
|
||||||
|
|
||||||
#define state syslog_state
|
#define state syslog_state
|
||||||
|
|
||||||
void syslog_init(void) __banked
|
void syslog_init(void) __banked
|
||||||
@@ -64,6 +59,7 @@ void syslog_stop(void) __banked
|
|||||||
|
|
||||||
void syslog_callback(uint16_t lport) __banked
|
void syslog_callback(uint16_t lport) __banked
|
||||||
{
|
{
|
||||||
|
uint16_t syslog_hdr;
|
||||||
if (lport != state.syslog_conn->lport)
|
if (lport != state.syslog_conn->lport)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#ifndef _SYSLOG_H_
|
#ifndef _SYSLOG_H_
|
||||||
#define _SYSLOG_H_
|
#define _SYSLOG_H_
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#define LOGBUF_SIZE 512
|
#define LOGBUF_SIZE 512
|
||||||
@@ -8,7 +9,7 @@
|
|||||||
#define SYSLOG_PORT_DEFAULT 514
|
#define SYSLOG_PORT_DEFAULT 514
|
||||||
|
|
||||||
struct syslog_state {
|
struct syslog_state {
|
||||||
uint8_t enabled;
|
bool enabled;
|
||||||
uint8_t line_available;
|
uint8_t line_available;
|
||||||
uint16_t writeptr ;
|
uint16_t writeptr ;
|
||||||
uint16_t readptr;
|
uint16_t readptr;
|
||||||
|
|||||||
Reference in new issue
Block a user