X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=libatalk%2Fdsi%2Fdsi_opensess.c;h=2945f9b185f242de3a6a767f1c8d3a5e281ee38e;hb=e450b7b95579a4a4358e499fdbf93620aa09bae2;hp=e074a1120528f5d44392c4c1a99aedb21ea8f160;hpb=2fdd522410f80afcd055d7333f491ee6c0b4b9fa;p=netatalk.git diff --git a/libatalk/dsi/dsi_opensess.c b/libatalk/dsi/dsi_opensess.c index e074a112..2945f9b1 100644 --- a/libatalk/dsi/dsi_opensess.c +++ b/libatalk/dsi/dsi_opensess.c @@ -16,27 +16,12 @@ #include #include -static void dsi_init_buffer(DSI *dsi) -{ - size_t quantum = dsi->server_quantum ? dsi->server_quantum : DSI_SERVQUANT_DEF; - - /* default is 12 * 300k = 3,6 MB (Apr 2011) */ - if ((dsi->buffer = malloc(dsi->dsireadbuf * 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 * quantum); -} - /* OpenSession. set up the connection */ void dsi_opensession(DSI *dsi) { uint32_t i = 0; /* this serves double duty. it must be 4-bytes long */ int offs; - dsi_init_buffer(dsi); if (setnonblock(dsi->socket, 1) < 0) { LOG(log_error, logtype_dsi, "dsi_opensession: setnonblock: %s", strerror(errno)); AFP_PANIC("setnonblock error"); @@ -59,7 +44,7 @@ void dsi_opensession(DSI *dsi) /* let the client know the server quantum. we don't use the * max server quantum due to a bug in appleshare client 3.8.6. */ dsi->header.dsi_flags = DSIFL_REPLY; - dsi->header.dsi_code = 0; + dsi->header.dsi_data.dsi_code = 0; /* dsi->header.dsi_command = DSIFUNC_OPEN;*/ dsi->cmdlen = 2 * (2 + sizeof(i)); /* length of data. dsi_send uses it. */