Changeset 2096 for Whitix/branches

Show
Ignore:
Timestamp:
05/27/10 12:30:42 (21 months ago)
Author:
mwhitworth
Message:

Several fixes, currently debugging SocketAccept.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • Whitix/branches/netchannel/user/sdk/network/socket.c

    r2088 r2096  
    22 
    33#include <stdio.h> 
     4 
     5#include "tcp.h" 
     6#include "udp.h" 
    47 
    58int SocketCreate(Socket* socket, int domain, int type, int protocol) 
     
    3538} 
    3639 
    37 int SocketAccept(Socket* socket, Socket* child, struct SockAddr* addr) 
     40int SocketAccept(Socket* socket, Socket* child, struct SockAddr* addr, int* addrLen) 
    3841{ 
     42        printf("SocketAccept(%#X, %#X, %#X, %#X)\n", socket, child, addr, addrLen); 
     43 
     44        printf("accept = %#X\n", socket->ops->accept); 
     45 
    3946        if (socket && socket->ops && socket->ops->accept) 
    40                 return socket->ops->accept(socket, child, addr); 
     47                return socket->ops->accept(socket, child, addr, addrLen); 
    4148 
    4249        return -1; 
     
    6572} 
    6673 
    67 int SocketSendTo(Socket* socket, const void* buffer, unsigned int length, int flags, struct SockAddr* dest) 
     74int SocketSendTo(Socket* socket, const void* buffer, unsigned long length, int flags, struct SockAddr* dest) 
    6875{ 
    6976        if (!socket) 
     
    7683} 
    7784 
    78 int SocketRecv(Socket* socket, void* buffer, unsigned int length, int 
     85int SocketRecv(Socket* socket, void* buffer, unsigned long length, int 
    7986                flags) 
    8087{ 
     
    8895} 
    8996 
    90 int SocketRecvFrom(Socket* socket, const void* buffer, unsigned int length, int flags, 
     97int SocketRecvFrom(Socket* socket, void* buffer, unsigned long length, int flags, 
    9198        struct SockAddr* dest) 
    9299{ 
     
    109116 
    110117        /* TODO: Free socket, channel */ 
    111         printf("SocketClose\n"); 
     118//      printf("SocketClose\n"); 
    112119 
    113120        return -1;