X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=libatalk%2Fdsi%2Fdsi_tcp.c;h=24fde971fbd2aca085456c8494e7dd3bbeccfb79;hb=ae7f70b27d3f366a7b744981643e28fba8cc6b0d;hp=6e7ac97431735d3bceb3392a1674ce296892b790;hpb=9d4035dfc092572c8f53f20d8335ab3045a9b5d5;p=netatalk.git diff --git a/libatalk/dsi/dsi_tcp.c b/libatalk/dsi/dsi_tcp.c index 6e7ac974..24fde971 100644 --- a/libatalk/dsi/dsi_tcp.c +++ b/libatalk/dsi/dsi_tcp.c @@ -10,8 +10,6 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ -#define USE_TCP_NODELAY - #include #include #include @@ -85,9 +83,49 @@ static void timeout_handler(int sig _U_) exit(EXITERR_CLNT); } +/*! + * Allocate DSI read buffer and read-ahead buffer + */ +static void dsi_init_buffer(DSI *dsi) +{ + if ((dsi->commands = malloc(dsi->server_quantum)) == NULL) { + LOG(log_error, logtype_dsi, "dsi_init_buffer: OOM"); + AFP_PANIC("OOM in dsi_init_buffer"); + } + + /* dsi_peek() read ahead buffer, default is 12 * 300k = 3,6 MB (Apr 2011) */ + if ((dsi->buffer = malloc(dsi->dsireadbuf * dsi->server_quantum)) == NULL) { + LOG(log_error, logtype_dsi, "dsi_init_buffer: OOM"); + AFP_PANIC("OOM in dsi_init_buffer"); + } + dsi->start = dsi->buffer; + dsi->eof = dsi->buffer; + dsi->end = dsi->buffer + (dsi->dsireadbuf * dsi->server_quantum); +} + +/*! + * Free any allocated ressources of the master afpd DSI objects and close server socket + */ +void dsi_free(DSI *dsi) +{ + close(dsi->serversock); + dsi->serversock = -1; + + free(dsi->commands); + dsi->commands = NULL; + + free(dsi->buffer); + dsi->buffer = NULL; + +#ifdef USE_ZEROCONF + free(dsi->bonjourname); + dsi->bonjourname = NULL; +#endif +} + static struct itimerval itimer; /* accept the socket and do a little sanity checking */ -static int dsi_tcp_open(DSI *dsi) +static pid_t dsi_tcp_open(DSI *dsi) { pid_t pid; SOCKLEN_T len; @@ -138,6 +176,8 @@ static int dsi_tcp_open(DSI *dsi) } #endif + dsi_init_buffer(dsi); + /* read in commands. this is similar to dsi_receive except * for the fact that we do some sanity checking to prevent * delinquent connections from causing mischief. */ @@ -146,7 +186,7 @@ static int dsi_tcp_open(DSI *dsi) len = dsi_stream_read(dsi, block, 2); if (!len ) { /* connection already closed, don't log it (normal OSX 10.3 behaviour) */ - exit(EXITERR_CLNT); + exit(EXITERR_CLOSED); } if (len < 2 || (block[0] > DSIFL_MAX) || (block[1] > DSIFUNC_MAX)) { LOG(log_error, logtype_dsi, "dsi_tcp_open: invalid header"); @@ -169,14 +209,14 @@ static int dsi_tcp_open(DSI *dsi) dsi->header.dsi_command = block[1]; memcpy(&dsi->header.dsi_requestID, block + 2, sizeof(dsi->header.dsi_requestID)); - memcpy(&dsi->header.dsi_code, block + 4, sizeof(dsi->header.dsi_code)); + memcpy(&dsi->header.dsi_data.dsi_code, block + 4, sizeof(dsi->header.dsi_data.dsi_code)); memcpy(&dsi->header.dsi_len, block + 8, sizeof(dsi->header.dsi_len)); memcpy(&dsi->header.dsi_reserved, block + 12, sizeof(dsi->header.dsi_reserved)); dsi->clientID = ntohs(dsi->header.dsi_requestID); /* make sure we don't over-write our buffers. */ - dsi->cmdlen = min(ntohl(dsi->header.dsi_len), DSI_CMDSIZ); + dsi->cmdlen = min(ntohl(dsi->header.dsi_len), dsi->server_quantum); stored = 0; while (stored < dsi->cmdlen) { @@ -264,25 +304,45 @@ iflist_done: #define AI_NUMERICSERV 0 #endif -/* this needs to accept passed in addresses */ +/*! + * Initialize DSI over TCP + * + * @param dsi (rw) DSI handle + * @param hostname (r) pointer to hostname string + * @param inaddress (r) Optional IPv4 or IPv6 address with an optional port, may be NULL + * @param inport (r) pointer to port string + * + * Creates listening AFP/DSI socket. If the parameter inaddress is NULL, then we listen + * on the wildcard address, ie on all interfaces. That should mean listening on the IPv6 + * address "::" on IPv4/IPv6 dual stack kernels, accepting both v4 and v6 requests. + * + * If the parameter inaddress is not NULL, then we only listen on the given address. + * The parameter may contain a port number using the URL format for address and port: + * + * IPv4, IPv4:port, IPv6, [IPv6], [IPv6]:port + * + * Parameter inport must be a valid pointer to a port string and is used if the inaddress + * parameter doesn't contain a port. + * + * @returns 0 on success, -1 on failure + */ int dsi_tcp_init(DSI *dsi, const char *hostname, const char *inaddress, const char *inport) { EC_INIT; int flag, err; - char *a = NULL, *b; - const char *address; - const char *port; + char *address = NULL, *port = NULL; struct addrinfo hints, *servinfo, *p; - /* Check whether address is of the from IP:PORT and split */ - address = inaddress; - port = inport; - if (address && strchr(address, ':')) { - EC_NULL_LOG( address = a = strdup(address) ); - b = strchr(a, ':'); - *b = 0; - port = b + 1; - } + /* inaddress may be NULL */ + AFP_ASSERT(dsi && hostname && inport); + + if (inaddress) + /* Check whether address is of the from IP:PORT and split */ + EC_ZERO( tokenize_ip_port(inaddress, &address, &port) ); + + if (port == NULL) + /* inport is supposed to always contain a valid port string */ + EC_NULL( port = strdup(inport) ); /* Prepare hint for getaddrinfo */ memset(&hints, 0, sizeof hints); @@ -303,8 +363,8 @@ int dsi_tcp_init(DSI *dsi, const char *hostname, const char *inaddress, const ch hints.ai_family = AF_UNSPEC; #endif } - if ((ret = getaddrinfo(address ? address : NULL, port, &hints, &servinfo)) != 0) { - LOG(log_error, logtype_dsi, "dsi_tcp_init: getaddrinfo: %s\n", gai_strerror(ret)); + if ((ret = getaddrinfo(address, port, &hints, &servinfo)) != 0) { + LOG(log_error, logtype_dsi, "dsi_tcp_init(%s): getaddrinfo: %s\n", address ? address : "*", gai_strerror(ret)); EC_FAIL; } @@ -329,13 +389,11 @@ int dsi_tcp_init(DSI *dsi, const char *hostname, const char *inaddress, const ch setsockopt(dsi->serversock, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof (on)); #endif -#ifdef USE_TCP_NODELAY #ifndef SOL_TCP #define SOL_TCP IPPROTO_TCP #endif flag = 1; setsockopt(dsi->serversock, SOL_TCP, TCP_NODELAY, &flag, sizeof(flag)); -#endif /* USE_TCP_NODELAY */ if (bind(dsi->serversock, p->ai_addr, p->ai_addrlen) == -1) { close(dsi->serversock); @@ -409,8 +467,10 @@ interfaces: guess_interface(dsi, hostname, port ? port : "548"); EC_CLEANUP: - if (a) - free(a); + if (address) + free(address); + if (port) + free(port); EC_EXIT; }