callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

broadway: Allow binding http server to an ip

Browse Source
This commit is contained in:
Alexander Larsson 2013-01-10 21:38:15 +01:00
parent 53083ea7b4
commit 2e76e5a543
3 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gdk/broadway/broadway-server.c
View File

@ -19,6 +19,7 @@ typedef struct BroadwayWindow BroadwayWindow;
struct _BroadwayServer {
GObject parent_instance;
char *address;
int port;
GSocketService *service;
BroadwayOutput *output;
@ -123,6 +124,10 @@ broadway_server_init (BroadwayServer *server)
static void
broadway_server_finalize (GObject *object)
{
BroadwayServer *server = BROADWAY_SERVER (object);
g_free (server->address);
G_OBJECT_CLASS (broadway_server_parent_class)->finalize (object);
}
@ -1225,20 +1230,50 @@ handle_incoming_connection (GSocketService *service,
}
BroadwayServer *
broadway_server_new (int port, GError **error)
broadway_server_new (char *address, int port, GError **error)
{
BroadwayServer *server;
GInetAddress *inet_address;
GSocketAddress *socket_address;
server = g_object_new (BROADWAY_TYPE_SERVER, NULL);
server->port = port;
server->address = g_strdup (address);
if (!g_socket_listener_add_inet_port (G_SOCKET_LISTENER (server->service),
server->port,
G_OBJECT (server),
error))
if (address == NULL)
{
g_prefix_error (error, "Unable to listen to port %d: ", server->port);
return NULL;
if (!g_socket_listener_add_inet_port (G_SOCKET_LISTENER (server->service),
server->port,
G_OBJECT (server),
error))
{
g_prefix_error (error, "Unable to listen to port %d: ", server->port);
return NULL;
}
}
else
{
inet_address = g_inet_address_new_from_string (address);
if (inet_address == NULL)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "Invalid ip address %s: ", address);
return NULL;
}
socket_address = g_inet_socket_address_new (inet_address, port);
g_object_unref (inet_address);
if (!g_socket_listener_add_address (G_SOCKET_LISTENER (server->service),
socket_address,
G_SOCKET_TYPE_STREAM,
G_SOCKET_PROTOCOL_TCP,
G_OBJECT (server),
NULL,
error))
{
g_prefix_error (error, "Unable to listen to %s:%d: ", server->address, server->port);
g_object_unref (socket_address);
return NULL;
}
g_object_unref (socket_address);
}
g_signal_connect (server->service, "incoming",

3
gdk/broadway/broadway-server.h
View File

@ -19,7 +19,8 @@ typedef struct _BroadwayServerClass BroadwayServerClass;
#define BROADWAY_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), BROADWAY_TYPE_SERVER, BroadwayServerClass))
BroadwayServer *broadway_server_new (int port,
BroadwayServer *broadway_server_new (char *address,
int port,
GError **error);
gboolean broadway_server_has_client (BroadwayServer *server);
void broadway_server_flush (BroadwayServer *server);

4
gdk/broadway/broadwayd.c
View File

@ -495,10 +495,12 @@ main (int argc, char *argv[])
GSocketAddress *address;
GSocketService *listener;
char *path, *base;
char *http_address = NULL;
int http_port = 0;
int display = 1;
const GOptionEntry entries[] = {
{ "port", 'p', 0, G_OPTION_ARG_INT, &http_port, "Httpd port", "PORT" },
{ "address", 'a', 0, G_OPTION_ARG_STRING, &http_address, "Ip address to bind to ", "ADDRESS" },
{ NULL }
};
@ -528,7 +530,7 @@ main (int argc, char *argv[])
if (http_port == 0)
http_port = 8080 + (display - 1);
server = broadway_server_new (http_port, &error);
server = broadway_server_new (http_address, http_port, &error);
if (server == NULL)
{
g_printerr ("%s\n", error->message);