LADI
/
gabriel
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* autogen.sh: Fix the params to autoreconf 

* src/gabriel-session.c: (gabriel_create_tcp_server),
  (gabriel_handle_clients): Put TCP server socket creation in a seperate
  function as the first step to abstract the server socket creation.


git-svn-id: https://gabriel.svn.sourceforge.net/svnroot/gabriel/gabriel@20 841437c2-2226-0410-8ced-e7c76d862a31
This commit is contained in:
zeenix 2007-01-30 16:32:29 +00:00
parent d653c5c8db
commit dee9abcfa3
3 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-01-30 Zeeshan Ali <zeenix@gstreamer.net>
* autogen.sh: Fix the params to autoreconf
* src/gabriel-session.c: (gabriel_create_tcp_server),
(gabriel_handle_clients): Put TCP server socket creation in a seperate
function as the first step to abstract the server socket creation.
2007-01-29 Zeeshan Ali <zeenix@gstreamer.net>
* README: Inform the user about socat/ssh requirement on the

2
autogen.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh
autoreconf -fv
autoreconf -fsv

34
src/gabriel-session.c
View File

@ -24,9 +24,10 @@
extern gboolean shutting_down;
void gabriel_handle_clients (GabrielSession * session,
gchar * local_address,
gint tcp_port)
static gint
gabriel_create_tcp_server (GabrielSession * session,
gchar * local_address,
gint tcp_port)
{
gint ret;
gint tcp_server_sock;
@ -36,7 +37,7 @@ void gabriel_handle_clients (GabrielSession * session,
tcp_server_sock = socket (PF_INET, SOCK_STREAM, 0);
if (tcp_server_sock < 0) {
g_critical ("%s\n", strerror (errno));
return;
return tcp_server_sock;
}
memset (&addr, 0, sizeof (struct sockaddr_in));
@ -63,11 +64,32 @@ void gabriel_handle_clients (GabrielSession * session,
g_print ("Listening to D-Bus clients on: \"tcp:host=%s,port=%d\"\n",
local_address, tcp_port);
return tcp_server_sock;
beach:
close (tcp_server_sock);
return -1;
}
void gabriel_handle_clients (GabrielSession * session,
gchar * local_address,
gint tcp_port)
{
gint ret;
gint server_socket;
struct sockaddr_in addr;
/* Now the client side */
server_socket = gabriel_create_tcp_server (session, local_address, tcp_port);
if (server_socket < 0) {
return;
}
while (!shutting_down) {
GabrielClient *client;
gint client_sock;
client_sock = accept (tcp_server_sock, NULL, NULL);
client_sock = accept (server_socket, NULL, NULL);
if (client_sock < 0) {
if (!shutting_down) {
g_critical ("%s\n", strerror (errno));
@ -81,7 +103,7 @@ void gabriel_handle_clients (GabrielSession * session,
}
beach:
close (tcp_server_sock);
close (server_socket);
}
void