Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 07:00:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Made compilation with latest mongoose possible (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-01-10 13:47:51 +01:00
parent 8556d0cdf7
commit 950a428641
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/mongoose/mongoose.c vendored
View File

@ -370,7 +370,7 @@ void iobuf_remove(struct iobuf *io, size_t n) {
static size_t ns_out(struct ns_connection *nc, const void *buf, size_t len) {
if (nc->flags & NSF_UDP) {
long n = sendto(nc->sock, buf, len, 0, &nc->sa.sa, sizeof(nc->sa.sin));
long n = sendto(nc->sock, (const char*)buf, len, 0, &nc->sa.sa, sizeof(nc->sa.sin));
DBG(("%p %d send %ld (%d %s)", nc, nc->sock, n, errno, strerror(errno)));
return n < 0 ? 0 : n;
} else {

2
src/emu/luaengine.c
View File

@ -18,7 +18,7 @@
#include "osdepend.h"
#include "drivenum.h"
#include "ui/ui.h"
#include "web/mongoose.h"
#include "mongoose/mongoose.h"
//**************************************************************************
// LUA ENGINE

23
src/emu/webengine.c
View File

@ -8,7 +8,7 @@
***************************************************************************/
#include "web/mongoose.h"
#include "mongoose/mongoose.h"
#include "web/json/json.h"
#include "emu.h"
#include "emuopts.h"
@ -455,7 +455,7 @@ int web_engine::begin_request_handler(struct mg_connection *conn)
mg_send_header(conn, "Cache-Control", "no-cache, no-store, must-revalidate");
mg_send_header(conn, "Pragma", "no-cache");
mg_send_header(conn, "Expires", "0");
mg_send_file(conn, fullpath.cstr());
mg_send_file(conn, fullpath.cstr(), NULL);
return MG_MORE; // It is important to return MG_MORE after mg_send_file!
}
return 0;
@ -531,16 +531,15 @@ void web_engine::serve()
if (m_http) mg_poll_server(m_server, 0);
}
static int websocket_callback(struct mg_connection *c, enum mg_event ev) {
if (c->is_websocket) {
const char *message = (const char *)c->callback_param;
mg_websocket_write(c, 1, message, strlen(message));
}
return MG_TRUE;
}
void web_engine::push_message(const char *message)
{
if (m_server!=NULL)
mg_iterate_over_connections(m_server, websocket_callback, (void*)message);
struct mg_connection *c;
if (m_server!=NULL) {
// Iterate over all connections, and push current time message to websocket ones.
for (c = mg_next(m_server, NULL); c != NULL; c = mg_next(m_server, c)) {
if (c->is_websocket) {
mg_websocket_write(c, 1, message, strlen(message));
}
}
}
}