X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fstatus.c;h=0f45ce4571ab7cf1cdc0c1cbb1af4582b1419313;hb=260c314546ffcfdbef47f2c7de82d5310b26df0a;hp=ee9bd1fddd0fb15b304a9515d999ec07a75d59e7;hpb=f48d37d74860e5d9fcf21a3938ede5f3f9dc9f1a;p=netatalk.git diff --git a/etc/afpd/status.c b/etc/afpd/status.c index ee9bd1fd..0f45ce45 100644 --- a/etc/afpd/status.c +++ b/etc/afpd/status.c @@ -1,6 +1,4 @@ /* - * $Id: status.c,v 1.31 2010-03-29 15:22:57 franklahm Exp $ - * * Copyright (c) 1990,1993 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. */ @@ -30,15 +28,13 @@ #endif /* BSD4_4 */ #endif -#include -#include +#include + #include -#include -#include -#include #include +#include +#include -#include "globals.h" /* includes */ #include "status.h" #include "afp_config.h" #include "icon.h" @@ -48,32 +44,26 @@ static size_t maxstatuslen = 0; static void status_flags(char *data, const int notif, const int ipok, const unsigned char passwdbits, const int dirsrvcs _U_, int flags) { - u_int16_t status; + uint16_t status; + + status = AFPSRVRINFO_COPY + | AFPSRVRINFO_SRVSIGNATURE + | AFPSRVRINFO_SRVMSGS + | AFPSRVRINFO_FASTBOZO + | AFPSRVRINFO_SRVRDIR + | AFPSRVRINFO_SRVUTF8 + | AFPSRVRINFO_EXTSLEEP; - status = AFPSRVRINFO_COPY; if (passwdbits & PASSWD_SET) /* some uams may not allow this. */ status |= AFPSRVRINFO_PASSWD; if (passwdbits & PASSWD_NOSAVE) status |= AFPSRVRINFO_NOSAVEPASSWD; - status |= AFPSRVRINFO_SRVSIGNATURE; - /* only advertise tcp/ip if we have a valid address */ - if (ipok) + if (ipok) /* only advertise tcp/ip if we have a valid address */ status |= AFPSRVRINFO_TCPIP; - status |= AFPSRVRINFO_SRVMSGS; - /* Allow the user to decide if we should support server notifications. - * With this turned off, the clients will poll for directory changes every - * 10 seconds. This might be too costly to network resources, so make - * this an optional thing. Default will be to _not_ support server - * notifications. */ - if (notif) { + if (notif) /* Default is yes */ status |= AFPSRVRINFO_SRVNOTIFY; - } - status |= AFPSRVRINFO_FASTBOZO; - status |= AFPSRVRINFO_SRVRDIR; /* AFP 3.1 specs says we need to specify this, but may set the count to 0 */ - /* We don't set the UTF8 name flag here, we don't know whether we have enough space ... */ - - if (flags & OPTION_UUID) /* 05122008 FIXME: can we set AFPSRVRINFO_UUID here ? see AFPSRVRINFO_SRVRDIR*/ - status |= AFPSRVRINFO_UUID; + if (flags & OPTION_UUID) + status |= AFPSRVRINFO_UUID; status = htons(status); memcpy(data + AFPSTATUS_FLAGOFF, &status, sizeof(status)); @@ -84,7 +74,7 @@ static int status_server(char *data, const char *server, const struct afp_option char *start = data; char *Obj, *Type, *Zone; char buf[32]; - u_int16_t status; + uint16_t status; size_t len; /* make room for all offsets before server name */ @@ -92,14 +82,13 @@ static int status_server(char *data, const char *server, const struct afp_option /* extract the obj part of the server */ Obj = (char *) server; - nbp_name(server, &Obj, &Type, &Zone); if ((size_t)-1 == (len = convert_string( - options->unixcharset, options->maccharset, - Obj, -1, buf, sizeof(buf))) ) { - len = MIN(strlen(Obj), 31); + options->unixcharset, options->maccharset, + Obj, -1, buf, sizeof(buf))) ) { + len = MIN(strlen(Obj), 31); *data++ = len; memcpy( data, Obj, len ); - LOG ( log_error, logtype_afpd, "Could not set servername, using fallback"); + LOG ( log_error, logtype_afpd, "Could not set servername, using fallback"); } else { *data++ = len; memcpy( data, buf, len ); @@ -130,30 +119,46 @@ static int status_server(char *data, const char *server, const struct afp_option static void status_machine(char *data) { char *start = data; - u_int16_t status; + uint16_t status; int len; #ifdef AFS const char *machine = "afs"; #else /* !AFS */ - const char *machine = "Netatalk"; + const char *machine = "Netatalk%s"; #endif /* AFS */ + char buf[AFPSTATUS_MACHLEN+1]; memcpy(&status, start + AFPSTATUS_MACHOFF, sizeof(status)); data += ntohs( status ); - len = strlen( machine ); + + if ((strlen(machine) + strlen(VERSION)) <= AFPSTATUS_MACHLEN) { + len = snprintf(buf, AFPSTATUS_MACHLEN + 1, machine, VERSION); + } else { + if (strlen(VERSION) > AFPSTATUS_MACHLEN) { + len = snprintf(buf, AFPSTATUS_MACHLEN + 1, VERSION); + } else { + (void)snprintf(buf, AFPSTATUS_MACHLEN + 1, machine, ""); + (void)snprintf(buf + AFPSTATUS_MACHLEN - strlen(VERSION), + strlen(VERSION) + 1, + VERSION); + len = AFPSTATUS_MACHLEN; + } + } + *data++ = len; - memcpy( data, machine, len ); + memcpy( data, buf, len ); data += len; + status = htons(data - start); memcpy(start + AFPSTATUS_VERSOFF, &status, sizeof(status)); } /* server signature is a 16-byte quantity */ -static u_int16_t status_signature(char *data, int *servoffset, +static uint16_t status_signature(char *data, int *servoffset, const struct afp_options *options) { char *status; - u_int16_t offset, sigoff; + uint16_t offset, sigoff; status = data; @@ -176,11 +181,11 @@ static u_int16_t status_signature(char *data, int *servoffset, } static size_t status_netaddress(char *data, int *servoffset, - const ASP asp, const DSI *dsi, + const DSI *dsi, const struct afp_options *options) { char *begin; - u_int16_t offset; + uint16_t offset; size_t addresses_len = 0; begin = data; @@ -200,7 +205,7 @@ static size_t status_netaddress(char *data, int *servoffset, /* number of addresses. this currently screws up if we have a dsi connection, but we don't have the ip address. to get around this, we turn off the status flag for tcp/ip. */ - *data++ = ((options->fqdn && dsi)? 1 : 0) + (dsi ? 1 : 0) + (asp ? 1 : 0) + + *data++ = ((options->fqdn && dsi)? 1 : 0) + (dsi ? 1 : 0) + (((options->flags & OPTION_ANNOUNCESSH) && options->fqdn && dsi)? 1 : 0); /* ip address */ @@ -274,23 +279,6 @@ static size_t status_netaddress(char *data, int *servoffset, } } -#ifndef NO_DDP - if (asp) { - const struct sockaddr_at *ddpaddr = atp_sockaddr(asp->asp_atp); - - /* ddp address */ - *data++ = 6; - *data++ = 0x03; /* ddp address */ - memcpy(data, &ddpaddr->sat_addr.s_net, sizeof(ddpaddr->sat_addr.s_net)); - data += sizeof(ddpaddr->sat_addr.s_net); - memcpy(data, &ddpaddr->sat_addr.s_node, - sizeof(ddpaddr->sat_addr.s_node)); - data += sizeof(ddpaddr->sat_addr.s_node); - memcpy(data, &ddpaddr->sat_port, sizeof(ddpaddr->sat_port)); - data += sizeof(ddpaddr->sat_port); - } -#endif /* ! NO_DDP */ - /* calculate/store Directory Services Names offset */ offset = htons(data - begin); *servoffset += sizeof(offset); @@ -305,7 +293,7 @@ static size_t status_directorynames(char *data, int *diroffset, const struct afp_options *options) { char *begin = data; - u_int16_t offset; + uint16_t offset; memcpy(&offset, data + *diroffset, sizeof(offset)); offset = ntohs(offset); data += offset; @@ -345,9 +333,9 @@ static size_t status_directorynames(char *data, int *diroffset, } /* Calculate and store offset for UTF8ServerName */ - *diroffset += sizeof(u_int16_t); + *diroffset += sizeof(uint16_t); offset = htons(data - begin); - memcpy(begin + *diroffset, &offset, sizeof(u_int16_t)); + memcpy(begin + *diroffset, &offset, sizeof(uint16_t)); /* return length of buffer */ return (data - begin); @@ -358,10 +346,10 @@ static size_t status_utf8servername(char *data, int *nameoffset, const struct afp_options *options) { char *Obj, *Type, *Zone; - u_int16_t namelen; + uint16_t namelen; size_t len; char *begin = data; - u_int16_t offset, status; + uint16_t offset, status; memcpy(&offset, data + *nameoffset, sizeof(offset)); offset = ntohs(offset); @@ -376,32 +364,22 @@ static size_t status_utf8servername(char *data, int *nameoffset, */ /* extract the obj part of the server */ - Obj = (char *) (options->server ? options->server : options->hostname); - nbp_name(options->server ? options->server : options->hostname, &Obj, &Type, &Zone); - + Obj = options->hostname; if ((size_t) -1 == (len = convert_string ( - options->unixcharset, CH_UTF8_MAC, - Obj, -1, data+sizeof(namelen), maxstatuslen-offset )) ) { - LOG ( log_error, logtype_afpd, "Could not set utf8 servername"); + options->unixcharset, CH_UTF8_MAC, + Obj, -1, data+sizeof(namelen), maxstatuslen-offset )) ) { + LOG ( log_error, logtype_afpd, "Could not set utf8 servername"); - /* set offset to 0 */ - memset(begin + *nameoffset, 0, sizeof(offset)); + /* set offset to 0 */ + memset(begin + *nameoffset, 0, sizeof(offset)); data = begin + offset; - } - else { + } else { namelen = htons(len); memcpy( data, &namelen, sizeof(namelen)); data += sizeof(namelen); data += len; offset = htons(offset); - memcpy(begin + *nameoffset, &offset, sizeof(u_int16_t)); - - /* Now set the flag ... */ - memcpy(&status, begin + AFPSTATUS_FLAGOFF, sizeof(status)); - status = ntohs(status); - status |= AFPSRVRINFO_SRVUTF8; - status = htons(status); - memcpy(begin + AFPSTATUS_FLAGOFF, &status, sizeof(status)); + memcpy(begin + *nameoffset, &offset, sizeof(uint16_t)); } /* return length of buffer */ @@ -415,7 +393,7 @@ static void status_icon(char *data, const unsigned char *icondata, { char *start = data; char *sigdata = data + sigoffset; - u_int16_t ret, status; + uint16_t ret, status; memcpy(&status, start + AFPSTATUS_ICONOFF, sizeof(status)); if ( icondata == NULL ) { @@ -435,44 +413,27 @@ static void status_icon(char *data, const unsigned char *icondata, /* --------------------- */ -void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig, - const struct afp_options *options) +void status_init(AFPObj *obj, DSI *dsi) { - ASP asp; - DSI *dsi; - char *status = NULL; + char *status = dsi->status; size_t statuslen; - int c, sigoff, ipok; - - if (!(aspconfig || dsiconfig) || !options) - return; - - if (aspconfig) { - status = aspconfig->status; - maxstatuslen=sizeof(aspconfig->status); - asp = aspconfig->obj.handle; - } else - asp = NULL; - - ipok = 0; - if (dsiconfig) { - status = dsiconfig->status; - maxstatuslen=sizeof(dsiconfig->status); - dsi = dsiconfig->obj.handle; - if (dsi->server.ss_family == AF_INET) { /* IPv4 */ - const struct sockaddr_in *sa4 = (struct sockaddr_in *)&dsi->server; - ipok = sa4->sin_addr.s_addr ? 1 : 0; - } else { /* IPv6 */ - const struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)&dsi->server; - for (int i=0; i<16; i++) { - if (sa6->sin6_addr.s6_addr[i]) { - ipok = 1; - break; - } + int c, sigoff, ipok = 0; + const struct afp_options *options = &obj->options; + + maxstatuslen = sizeof(dsi->status); + + if (dsi->server.ss_family == AF_INET) { /* IPv4 */ + const struct sockaddr_in *sa4 = (struct sockaddr_in *)&dsi->server; + ipok = sa4->sin_addr.s_addr ? 1 : 0; + } else { /* IPv6 */ + const struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)&dsi->server; + for (int i=0; i<16; i++) { + if (sa6->sin6_addr.s6_addr[i]) { + ipok = 1; + break; } } - } else - dsi = NULL; + } /* * These routines must be called in order -- earlier calls @@ -495,16 +456,15 @@ void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig, */ status_flags(status, - options->server_notif, + options->flags & OPTION_SERVERNOTIF, (options->fqdn || ipok), options->passwdbits, (options->k5service && options->k5realm && options->fqdn), options->flags); /* returns offset to signature offset */ - c = status_server(status, options->server ? options->server : - options->hostname, options); + c = status_server(status, options->hostname, options); status_machine(status); - status_versions(status, asp, dsi); + status_versions(status, dsi); status_uams(status, options->uamlist); if (options->flags & OPTION_CUSTOMICON) status_icon(status, icon, sizeof(icon), c); @@ -514,7 +474,7 @@ void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig, sigoff = status_signature(status, &c, options); /* c now contains the offset where the netaddress offset lives */ - status_netaddress(status, &c, asp, dsi, options); + status_netaddress(status, &c, dsi, options); /* c now contains the offset where the Directory Names Count offset lives */ statuslen = status_directorynames(status, &c, dsi, options); @@ -523,24 +483,12 @@ void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig, if ( statuslen < maxstatuslen) statuslen = status_utf8servername(status, &c, dsi, options); -#ifndef NO_DDP - if (aspconfig) { - if (dsiconfig) /* status is dsiconfig->status */ - memcpy(aspconfig->status, status, statuslen); - asp_setstatus(asp, status, statuslen); - aspconfig->signature = status + sigoff; - aspconfig->statuslen = statuslen; + if ((options->flags & OPTION_CUSTOMICON) == 0) { + status_icon(status, apple_tcp_icon, sizeof(apple_tcp_icon), 0); } -#endif /* ! NO_DDP */ - if (dsiconfig) { - if ((options->flags & OPTION_CUSTOMICON) == 0) { - status_icon(status, apple_tcp_icon, sizeof(apple_tcp_icon), 0); - } - dsi_setstatus(dsi, status, statuslen); - dsiconfig->signature = status + sigoff; - dsiconfig->statuslen = statuslen; - } + dsi->signature = status + sigoff; + dsi->statuslen = statuslen; } /* set_signature() */ @@ -551,39 +499,39 @@ void status_init(AFPConfig *aspconfig, AFPConfig *dsiconfig, /* If cannot open conf file, use one-time signature. */ /* If -signature user:xxxxx, use it. */ -void set_signature(char *opt, struct afp_options *options) { +void set_signature(struct afp_options *options) { char *usersign; int fd, i; struct stat tmpstat; char *servername_conf; int header = 0; char buf[1024], *p; - FILE *fp, *randomp; + FILE *fp = NULL, *randomp; size_t len; char *server_tmp; - server_tmp = (options->server ? options->server : options->hostname); - if (strcmp(opt, "auto") == 0) { + server_tmp = options->hostname; + if (strcmp(options->signatureopt, "auto") == 0) { goto server_signature_auto; /* default */ - } else if (strcmp(opt, "host") == 0) { - LOG(log_warning, logtype_afpd, "WARNING: option \"-signature host\" is obsoleted. Switching back to auto.", opt); + } else if (strcmp(options->signatureopt, "host") == 0) { + LOG(log_warning, logtype_afpd, "WARNING: option \"-signature host\" is obsoleted. Switching back to auto.", options->signatureopt); goto server_signature_auto; /* same as auto */ - } else if (strncmp(opt, "user", 4) == 0) { + } else if (strncmp(options->signatureopt, "user", 4) == 0) { goto server_signature_user; /* user string */ } else { - LOG(log_error, logtype_afpd, "ERROR: option \"-signature %s\" is not valid. Switching back to auto.", opt); + LOG(log_error, logtype_afpd, "ERROR: option \"-signature %s\" is not valid. Switching back to auto.", options->signatureopt); goto server_signature_auto; /* switch back to auto*/ } server_signature_user: /* Signature type is user string */ - len = strlen(opt); + len = strlen(options->signatureopt); if (len <= 5) { - LOG(log_warning, logtype_afpd, "WARNING: option \"-signature %s\" is not valid. Switching back to auto.", opt); + LOG(log_warning, logtype_afpd, "WARNING: option \"-signature %s\" is not valid. Switching back to auto.", options->signatureopt); goto server_signature_auto; } - usersign = opt + 5; + usersign = options->signatureopt + 5; len = len - 5; if (len > 16) { LOG(log_warning, logtype_afpd, "WARNING: signature user string %s is very long !", usersign); @@ -663,12 +611,12 @@ server_signature_auto: } } else { /* conf file don't exist */ if (( fd = creat(options->sigconffile, 0644 )) < 0 ) { - LOG(log_error, logtype_atalkd, "ERROR: Cannot create %s (%s). Using one-time signature.", + LOG(log_error, logtype_afpd, "ERROR: Cannot create %s (%s). Using one-time signature.", options->sigconffile, strerror(errno)); goto server_signature_random; } if (( fp = fdopen( fd, "w" )) == NULL ) { - LOG(log_error, logtype_atalkd, "ERROR: Cannot fdopen %s (%s). Using one-time signature.", + LOG(log_error, logtype_afpd, "ERROR: Cannot fdopen %s (%s). Using one-time signature.", options->sigconffile, strerror(errno)); close(fd); goto server_signature_random; @@ -680,41 +628,9 @@ server_signature_auto: server_signature_random: /* generate signature from random number */ - if ((randomp = fopen("/dev/urandom", "r")) != NULL) { /* generate from /dev/urandom */ - for (i=0 ; i<16 ; i++) { - (options->signature)[i] = fgetc(randomp); - } - LOG(log_note, logtype_afpd, - "generate %s's signature %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X from /dev/urandom", - server_tmp, - (options->signature)[ 0], (options->signature)[ 1], - (options->signature)[ 2], (options->signature)[ 3], - (options->signature)[ 4], (options->signature)[ 5], - (options->signature)[ 6], (options->signature)[ 7], - (options->signature)[ 8], (options->signature)[ 9], - (options->signature)[10], (options->signature)[11], - (options->signature)[12], (options->signature)[13], - (options->signature)[14], (options->signature)[15]); - - } else { /* genarate from random() because cannot open /dev/urandom */ - srandom((unsigned int)time(NULL) + (unsigned int)options + (unsigned int)server_tmp); - for (i=0 ; i<16 ; i++) { - (options->signature)[i] = random() & 0xFF; - } - LOG(log_note, logtype_afpd, - "generate %s's signature %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X from random()", - server_tmp, - (options->signature)[ 0], (options->signature)[ 1], - (options->signature)[ 2], (options->signature)[ 3], - (options->signature)[ 4], (options->signature)[ 5], - (options->signature)[ 6], (options->signature)[ 7], - (options->signature)[ 8], (options->signature)[ 9], - (options->signature)[10], (options->signature)[11], - (options->signature)[12], (options->signature)[13], - (options->signature)[14], (options->signature)[15]); - } + randombytes(options->signature, 16); - if (fp && header) { /* conf file is created or size=0 */ + if (fp && header) { /* conf file is created or size=0 */ fprintf(fp, "# DON'T TOUCH NOR COPY THOUGHTLESSLY!\n"); fprintf(fp, "# This file is auto-generated by afpd.\n"); fprintf(fp, "# \n"); @@ -754,9 +670,8 @@ server_signature_done: /* this is the same as asp/dsi_getstatus */ int afp_getsrvrinfo(AFPObj *obj, char *ibuf _U_, size_t ibuflen _U_, char *rbuf, size_t *rbuflen) { - AFPConfig *config = obj->config; + memcpy(rbuf, obj->dsi->status, obj->dsi->statuslen); + *rbuflen = obj->dsi->statuslen; - memcpy(rbuf, config->status, config->statuslen); - *rbuflen = config->statuslen; return AFP_OK; }