multicast fixes

This commit is contained in:
roberto@sirius
2010-04-06 14:21:36 +02:00
parent 9887177d9a
commit 65cc44e611
4 changed files with 81 additions and 14 deletions
+6
View File
@@ -0,0 +1,6 @@
import uwsgi
def print_logs(ip, port, message):
print(ip, port, message)
uwsgi.udp_callable = print_logs
+30 -12
View File
@@ -125,7 +125,9 @@ int bind_to_udp(char *socket_name) {
struct sockaddr_in uws_addr;
char *udp_port;
#ifdef UWSGI_MULTICAST
struct ip_mreq mc;
#endif
udp_port = strchr(socket_name, ':');
if (udp_port == NULL) {
@@ -136,8 +138,15 @@ int bind_to_udp(char *socket_name) {
memset(&uws_addr, 0, sizeof(struct sockaddr_in));
uws_addr.sin_family = AF_INET;
uws_addr.sin_port = htons(atoi(udp_port + 1));
//uws_addr.sin_addr.s_addr = inet_addr(socket_name);
uws_addr.sin_addr.s_addr = INADDR_ANY;
if (socket_name[0] != 0) {
uws_addr.sin_addr.s_addr = inet_addr(socket_name);
}
else {
uws_addr.sin_addr.s_addr = INADDR_ANY;
}
serverfd = socket(AF_INET, SOCK_DGRAM, 0);
if (serverfd < 0) {
@@ -145,14 +154,19 @@ int bind_to_udp(char *socket_name) {
return -1;
}
// if multicast is enabled remember to bind to INADDR_ANY
mc.imr_multiaddr.s_addr = inet_addr("225.0.0.1");
if (socket_name[0] == 0) {
mc.imr_interface.s_addr = INADDR_ANY;
}
else {
mc.imr_interface.s_addr = inet_addr(socket_name);
#ifdef UWSGI_MULTICAST
if (uwsgi.multicast_group) {
uws_addr.sin_addr.s_addr = INADDR_ANY;
// if multicast is enabled remember to bind to INADDR_ANY
mc.imr_multiaddr.s_addr = inet_addr(uwsgi.multicast_group);
if (socket_name[0] == 0) {
mc.imr_interface.s_addr = INADDR_ANY;
}
else {
mc.imr_interface.s_addr = inet_addr(socket_name);
}
}
#endif
fprintf(stderr, "binding on UDP port: %d\n", ntohs(uws_addr.sin_port));
@@ -162,10 +176,14 @@ int bind_to_udp(char *socket_name) {
return -1;
}
fprintf(stderr, "joining uWSGI multicast group: %s:%d\n", "225.0.0.1", ntohs(uws_addr.sin_port));
if (setsockopt(serverfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mc, sizeof(mc))) {
perror("setsockopt()");
#ifdef UWSGI_MULTICAST
if (uwsgi.multicast_group) {
fprintf(stderr, "joining uWSGI multicast group: %s:%d\n", uwsgi.multicast_group, ntohs(uws_addr.sin_port));
if (setsockopt(serverfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mc, sizeof(mc))) {
perror("setsockopt()");
}
}
#endif
return serverfd;
+36 -2
View File
@@ -330,7 +330,12 @@ int main(int argc, char *argv[], char *envp[]) {
{"no-server", no_argument, &no_server, 1},
{"no-defer-accept", no_argument, &uwsgi.no_defer_accept, 1},
{"limit-as", required_argument, 0, LONG_ARGS_LIMIT_AS},
#ifdef UWSGI_UDP
{"udp", required_argument, 0, LONG_ARGS_UDP},
#endif
#ifdef UWSGI_MULTICAST
{"multicast", required_argument, 0, LONG_ARGS_MULTICAST},
#endif
#ifdef UWSGI_SNMP
{"snmp", no_argument, 0, LONG_ARGS_SNMP},
{"snmp-community", required_argument, 0, LONG_ARGS_SNMP_COMMUNITY},
@@ -1066,6 +1071,14 @@ int main(int argc, char *argv[], char *envp[]) {
}
#endif
#ifdef UWSGI_UDP
PyObject *udp_callable = PyDict_GetItemString(uwsgi.embedded_dict, "udp_callable");
PyObject *udp_callable_args = NULL;
if (udp_callable) {
udp_callable_args = PyTuple_New(3);
}
#endif
for (;;) {
if (ready_to_die >= uwsgi.numproc && uwsgi.to_hell) {
#ifdef UWSGI_SPOOLER
@@ -1200,8 +1213,21 @@ int main(int argc, char *argv[], char *envp[]) {
}
#endif
else {
// a simple udp logger
fprintf(stderr, "[udp:%s:%d] %.*s", udp_client_addr, ntohs(udp_client.sin_port), rlen, &uwsgi.wsgi_req->buffer);
if (udp_callable && udp_callable_args) {
PyTuple_SetItem(udp_callable_args, 0, PyString_FromString(udp_client_addr));
PyTuple_SetItem(udp_callable_args, 1, PyInt_FromLong(ntohs(udp_client.sin_port)));
PyTuple_SetItem(udp_callable_args, 2, PyString_FromStringAndSize(&uwsgi.wsgi_req->buffer, rlen));
PyObject *udp_response = python_call(udp_callable, udp_callable_args);
if (udp_response) {
Py_DECREF(udp_response);
}
if (PyErr_Occurred())
PyErr_Print();
}
else {
// a simple udp logger
fprintf(stderr, "[udp:%s:%d] %.*s", udp_client_addr, ntohs(udp_client.sin_port), rlen, &uwsgi.wsgi_req->buffer);
}
}
}
else {
@@ -2435,10 +2461,18 @@ void manage_opt(int i, char *optarg) {
case LONG_ARGS_PIDFILE:
uwsgi.pidfile = optarg;
break;
#ifdef UWSGI_UDP
case LONG_ARGS_UDP:
uwsgi.udp_socket = optarg;
uwsgi.master_process = 1;
break;
#endif
#ifdef UWSGI_MULTICAST
case LONG_ARGS_MULTICAST:
uwsgi.multicast_group = optarg;
uwsgi.master_process = 1;
break;
#endif
case LONG_ARGS_CHROOT:
uwsgi.chroot = optarg;
break;
+9
View File
@@ -128,6 +128,7 @@ PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(char *, Py_ssize_t);
#define LONG_ARGS_ASYNC 17021
#define LONG_ARGS_UGREEN_PAGES 17022
#define LONG_ARGS_FILE_CONFIG 17023
#define LONG_ARGS_MULTICAST 17024
#define UWSGI_OK 0
#define UWSGI_AGAIN 1
@@ -368,7 +369,15 @@ struct uwsgi_server {
int is_a_reload;
char *socket_name;
#ifdef UWSGI_UDP
char *udp_socket;
#endif
#ifdef UWSGI_MULTICAST
char *multicast_group;
#endif
#ifdef UWSGI_ERLANG
char *erlang_node;
char *erlang_cookie;