mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-06-07 09:27:05 +08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix line endings in console messages

Browse Source 
PUBLISHED_FROM=b7cf888512e535fcb81371d797bf8a72440baeaa
This commit is contained in:
Deomid Ryabkov 2016-10-20 16:21:35 +03:00 committed by Cesanta Bot
parent ace1dc53b2
commit 5bbf24bf41
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
examples/NXP_K64/main.c
View File

@ -47,13 +47,13 @@ void gpio_init() {
void ev_handler(struct mg_connection *nc, int ev, void *ev_data) { void ev_handler(struct mg_connection *nc, int ev, void *ev_data) {
if (ev == MG_EV_POLL) return; if (ev == MG_EV_POLL) return;
/* printf("ev %d\n", ev); */ /* printf("ev %d\r\n", ev); */
switch (ev) { switch (ev) {
case MG_EV_ACCEPT: { case MG_EV_ACCEPT: {
char addr[32]; char addr[32];
mg_sock_addr_to_str(&nc->sa, addr, sizeof(addr), mg_sock_addr_to_str(&nc->sa, addr, sizeof(addr),
MG_SOCK_STRINGIFY_IP | MG_SOCK_STRINGIFY_PORT); MG_SOCK_STRINGIFY_IP | MG_SOCK_STRINGIFY_PORT);
printf("%p: Connection from %s\n", nc, addr); printf("%p: Connection from %s\r\n", nc, addr);
break; break;
} }
case MG_EV_HTTP_REQUEST: { case MG_EV_HTTP_REQUEST: {
@ -61,7 +61,7 @@ void ev_handler(struct mg_connection *nc, int ev, void *ev_data) {
char addr[32]; char addr[32];
mg_sock_addr_to_str(&nc->sa, addr, sizeof(addr), mg_sock_addr_to_str(&nc->sa, addr, sizeof(addr),
MG_SOCK_STRINGIFY_IP | MG_SOCK_STRINGIFY_PORT); MG_SOCK_STRINGIFY_IP | MG_SOCK_STRINGIFY_PORT);
printf("%p: %.*s %.*s\n", nc, (int) hm->method.len, hm->method.p, printf("%p: %.*s %.*s\r\n", nc, (int) hm->method.len, hm->method.p,
(int) hm->uri.len, hm->uri.p); (int) hm->uri.len, hm->uri.p);
mg_send_response_line(nc, 200, mg_send_response_line(nc, 200,
"Content-Type: text/html\r\n" "Content-Type: text/html\r\n"
@ -75,7 +75,7 @@ void ev_handler(struct mg_connection *nc, int ev, void *ev_data) {
break; break;
} }
case MG_EV_CLOSE: { case MG_EV_CLOSE: {
printf("%p: Connection closed\n", nc); printf("%p: Connection closed\r\n", nc);
break; break;
} }
} }
@ -100,27 +100,27 @@ int main(void) {
lwip_init(); lwip_init();
gpio_init(); gpio_init();
LED_RED_ON(); LED_RED_ON();
printf("Waiting for link...\n"); printf("Waiting for link...\r\n");
#if USE_DHCP #if USE_DHCP
netif_add(&eth0, NULL, NULL, NULL, NULL, ethernetif_init, ethernet_input); netif_add(&eth0, NULL, NULL, NULL, NULL, ethernetif_init, ethernet_input);
printf("Waiting for DHCP...\n"); printf("Waiting for DHCP...\r\n");
LED_GREEN_ON(); LED_GREEN_ON();
dhcp_start(&eth0); dhcp_start(&eth0);
u8_t os = 0xff, ds; u8_t os = 0xff, ds;
do { do {
ds = eth0.dhcp->state; ds = eth0.dhcp->state;
if (ds != os) { if (ds != os) {
printf(" DHCP state: %d\n", ds); printf(" DHCP state: %d\r\n", ds);
os = ds; os = ds;
} }
sys_check_timeouts(); sys_check_timeouts();
} while (ds != DHCP_BOUND); } while (ds != DHCP_BOUND);
printf("DHCP bound.\n"); printf("DHCP bound.\r\n");
#else #else
ip_addr_t ip, nm, gw; ip_addr_t ip, nm, gw;
if (!ipaddr_aton(STATIC_IP, &ip) || !ipaddr_aton(STATIC_NM, &nm) || if (!ipaddr_aton(STATIC_IP, &ip) || !ipaddr_aton(STATIC_NM, &nm) ||
!ipaddr_aton(STATIC_GW, &gw)) { !ipaddr_aton(STATIC_GW, &gw)) {
printf("Invalid static IP configuration.\n"); printf("Invalid static IP configuration.\r\n");
return 1; return 1;
} else { } else {
netif_add(&eth0, &ip, &nm, &gw, NULL, ethernetif_init, ethernet_input); netif_add(&eth0, &ip, &nm, &gw, NULL, ethernetif_init, ethernet_input);
@ -128,7 +128,7 @@ int main(void) {
} }
#endif #endif
netif_set_default(&eth0); netif_set_default(&eth0);
printf("Setting up HTTP server...\n"); printf("Setting up HTTP server...\r\n");
struct mg_mgr mgr; struct mg_mgr mgr;
mg_mgr_init(&mgr, NULL); mg_mgr_init(&mgr, NULL);
@ -138,13 +138,13 @@ int main(void) {
opts.error_string = &err; opts.error_string = &err;
struct mg_connection *nc = mg_bind_opt(&mgr, "80", ev_handler, opts); struct mg_connection *nc = mg_bind_opt(&mgr, "80", ev_handler, opts);
if (nc == NULL) { if (nc == NULL) {
printf("Failed to create listener: %s\n", err); printf("Failed to create listener: %s\r\n", err);
LED_RED_ON(); LED_RED_ON();
LED_GREEN_OFF(); LED_GREEN_OFF();
return 1; return 1;
} }
mg_set_protocol_http_websocket(nc); mg_set_protocol_http_websocket(nc);
printf("Server address: http://%s/\n", ipaddr_ntoa(&eth0.ip_addr)); printf("Server address: http://%s/\r\n", ipaddr_ntoa(&eth0.ip_addr));
LED_RED_OFF(); LED_RED_OFF();
LED_GREEN_ON(); LED_GREEN_ON();