-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Server functions which handle file transfers and room directories.
+ *
+ */
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include <time.h>
#include <limits.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
#include "citadel.h"
#include "server.h"
#include "config.h"
#include "room_ops.h"
#include "msgbase.h"
#include "tools.h"
+#include "citserver.h"
void cmd_delf(char *filename)
{
char pathname[64];
int a;
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
- return;
- }
-
- if (!is_room_aide()) {
- cprintf("%d Higher access required.\n",
- ERROR+HIGHER_ACCESS_REQUIRED);
- return;
- }
-
+ if (CtdlAccessCheck(ac_room_aide)) return;
if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
cprintf("%d No directory in this room.\n",ERROR+NOT_HERE);
extract(filename,cmdbuf,0);
extract(newroom,cmdbuf,1);
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
- return;
- }
-
- if (!is_room_aide()) {
- cprintf("%d Higher access required.\n",
- ERROR+HIGHER_ACCESS_REQUIRED);
- return;
- }
+ if (CtdlAccessCheck(ac_room_aide)) return;
if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
cprintf("%d No directory in this room.\n",ERROR+NOT_HERE);
int a,e;
time_t now;
FILE *ofp;
+ static int seq = 1;
extract(filename,cmdbuf,0);
extract(destsys,cmdbuf,1);
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
- return;
- }
-
- if (!is_room_aide()) {
- cprintf("%d Higher access required.\n",
- ERROR+HIGHER_ACCESS_REQUIRED);
- return;
- }
+ if (CtdlAccessCheck(ac_room_aide)) return;
if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
cprintf("%d No directory in this room.\n",ERROR+NOT_HERE);
ERROR+NO_SUCH_SYSTEM,destsys);
return;
}
- snprintf(outfile,sizeof outfile,"%s/network/spoolin/nsf.%d",BBSDIR,
- getpid());
+ snprintf(outfile, sizeof outfile,
+ "%s/network/spoolin/nsf.%04x.%04x",
+ BBSDIR, getpid(), ++seq);
ofp=fopen(outfile,"a");
if (ofp==NULL) {
cprintf("%d internal error\n",ERROR);
*/
void OpenCmdResult(char *filename, char *mime_type) {
struct stat statbuf;
+ time_t modtime;
+ long filesize;
fstat(fileno(CC->download_fp), &statbuf);
- cprintf("%d %ld|%ld|%s|%s\n", OK, statbuf.st_size, statbuf.st_mtime,
- filename, mime_type);
- }
+ filesize = (long) statbuf.st_size;
+ modtime = (time_t) statbuf.st_mtime;
+
+ cprintf("%d %ld|%ld|%s|%s\n",
+ OK, filesize, modtime, filename, mime_type);
+}
/*
extract(filename,cmdbuf,0);
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
- return;
- }
+ if (CtdlAccessCheck(ac_logged_in)) return;
if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
cprintf("%d No directory in this room.\n",ERROR+NOT_HERE);
extract(CC->upl_file,cmdbuf,0);
extract(CC->upl_comment,cmdbuf,1);
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);
- return;
- }
+ if (CtdlAccessCheck(ac_logged_in)) return;
if ((CC->quickroom.QRflags & QR_DIRECTORY) == 0) {
cprintf("%d No directory in this room.\n",ERROR+NOT_HERE);
if (CC->upload_fp == NULL) {
cprintf("%d You don't have an upload file open.\n",ERROR);
return;
- }
+ }
fclose(CC->upload_fp);
CC->upload_fp = NULL;
if ((!strcasecmp(cmd,"1")) && (CC->upload_type != UPL_FILE)) {
CC->upload_type = UPL_FILE;
cprintf("%d Upload completed.\n", OK);
- return;
+
+ if (CC->upload_type == UPL_NET) {
+ if (fork()==0) {
+ execlp("./netproc", "netproc", "-i", NULL);
+ exit(errno);
+ }
}
+ return;
+ }
+
if (!strcasecmp(cmd,"1")) {
cprintf("%d File '%s' saved.\n",OK,CC->upl_path);
fp = fopen(CC->upl_filedir,"a");
if (fp!=NULL) {
fprintf(fp,"%s %s\n",CC->upl_file,CC->upl_comment);
fclose(fp);
- }
+ }
/* put together an upload notice */
sprintf(upload_notice,
"NEW UPLOAD: '%s'\n %s\n",
CC->upl_file,CC->upl_comment);
- quickie_message(CC->curr_user, CC->quickroom.QRname,
+ quickie_message(CC->curr_user, NULL, CC->quickroom.QRname,
upload_notice);
- }
+ }
else {
abort_upl(CC);
cprintf("%d File '%s' aborted.\n",OK,CC->upl_path);
- }
}
+}
+
+
/*
* read from the download file
*/
void cmd_nuop(char *cmdbuf)
{
+ static int seq = 1;
+
if (strlen(CC->net_node)==0) {
cprintf("%d Not authenticated as a network node.\n",
ERROR+NOT_LOGGED_IN);
return;
}
- snprintf(CC->upl_path,sizeof CC->upl_path,"%s/network/spoolin/%s.%d",
- BBSDIR,CC->net_node,getpid());
+ snprintf(CC->upl_path, sizeof CC->upl_path,
+ "%s/network/spoolin/%s.%04x.%04x",
+ BBSDIR, CC->net_node, getpid(), ++seq);
CC->upload_fp = fopen(CC->upl_path,"r");
if (CC->upload_fp != NULL) {