Changeset 3253:05670218c1d3 in roaraudio

Timestamp:

01/30/10 13:40:35 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

new network interface

Location:

roard

Files:

• include/network.h (modified) (1 diff)
• include/roard.h (modified) (1 diff)
• network.c (modified) (5 diffs)

roard/include/network.h

@@ -30 +30 @@
 int net_check_listen  (void);
 
-int net_get_new_client (int sock, int proto);
+struct roard_listen;
+
+int net_get_new_client (struct roard_listen * lsock);
 
 #endif

roard/include/roard.h

@@ -130 +130 @@
 
 #ifdef ROAR_SUPPORT_LISTEN
-struct {
+struct roard_listen {
  int socket;
  int proto;

roard/network.c

@@ -65 +65 @@
    if ( g_listen[i].socket != -1 ) {
     if ( FD_ISSET(g_listen[i].socket, &sl) ) {
-     if ( net_get_new_client(g_listen[i].socket, g_listen[i].proto) == -1 )
+     if ( net_get_new_client(&(g_listen[i])) == -1 )
       return -1;
     }
@@ -79 +79 @@
 
 #ifdef _CAN_OPERATE
-int net_get_new_client (int sock, int proto) {
+int net_get_new_client (struct roard_listen * lsock) {
  int fh;
  int client;
@@ -91 +91 @@
  socklen_t                addrlen = sizeof(addr);
 
- fh = accept(sock, (struct sockaddr*)&addr, &addrlen);
+ fh = accept(lsock->socket, (struct sockaddr*)&addr, &addrlen);
 
  ROAR_DBG("net_get_new_client(void): fh = %i", fh);
@@ -131 +131 @@
  }
 
- ROAR_DBG("net_get_new_client(*): proto=0x%.4x", proto);
+ ROAR_DBG("net_get_new_client(*): proto=0x%.4x", lsock->proto);
 
- if ( clients_set_proto(client, proto) == -1 ) {
-  ROAR_WARN("net_get_new_client(*): Setting proto(0x%.4x) of client %i failed.", proto, client);
+ if ( clients_set_proto(client, lsock->proto) == -1 ) {
+  ROAR_WARN("net_get_new_client(*): Setting proto(0x%.4x) of client %i failed.", lsock->proto, client);
   return -1;
  }
 
- switch (proto) {
+ switch (lsock->proto) {
   case ROAR_PROTO_ROARAUDIO:
     // nothing needed to be done here
@@ -158 +158 @@
    break;
 #endif
+  case ROAR_PROTO_SIMPLE:
+   break;
 #endif
   default: