oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Set socket buffer size.

Browse Source 
Changed transfer message.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@754 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1996-09-16 19:47:26 +00:00
parent 1433383cc7
commit c568beb763
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
appl/ftp/ftp/ftp.c
View File

@@ -576,6 +576,18 @@ copy_stream(FILE *from, FILE *to)
return bytes; return bytes;
} }
static void
set_buffer_size(int fd, int read)
{
#if defined(SO_RCVBUF) && defined(SO_SNDBUF)
size_t size = 1048576;
while(size >= 131072 &&
setsockopt(fd, SOL_SOCKET, read ? SO_RCVBUF : SO_SNDBUF,
&size, sizeof(size)) < 0)
size /= 2;
#endif
}
void void
sendrequest(char *cmd, char *local, char *remote, int printnames) sendrequest(char *cmd, char *local, char *remote, int printnames)
{ {
@@ -714,7 +726,8 @@ sendrequest(char *cmd, char *local, char *remote, int printnames)
dout = dataconn(lmode); dout = dataconn(lmode);
if (dout == NULL) if (dout == NULL)
goto abort; goto abort;
(void) gettimeofday(&start, (struct timezone *)0); set_buffer_size(fileno(dout), 0);
gettimeofday(&start, (struct timezone *)0);
oldintp = signal(SIGPIPE, SIG_IGN); oldintp = signal(SIGPIPE, SIG_IGN);
switch (curtype) { switch (curtype) {
@@ -916,6 +929,7 @@ recvrequest(char *cmd, char *local, char *remote, char *lmode, int printnames)
din = dataconn("r"); din = dataconn("r");
if (din == NULL) if (din == NULL)
goto abort; goto abort;
set_buffer_size(fileno(din), 1);
if (strcmp(local, "-") == 0) if (strcmp(local, "-") == 0)
fout = stdout; fout = stdout;
else if (*local == '|') { else if (*local == '|') {
@@ -1271,8 +1285,10 @@ ptransfer(char *direction, long int bytes,
{ {
struct timeval td; struct timeval td;
float s; float s;
long bs; float bs;
int prec;
char *unit;
if (verbose) { if (verbose) {
td.tv_sec = t1->tv_sec - t0->tv_sec; td.tv_sec = t1->tv_sec - t0->tv_sec;
td.tv_usec = t1->tv_usec - t0->tv_usec; td.tv_usec = t1->tv_usec - t0->tv_usec;
@@ -1282,8 +1298,21 @@ ptransfer(char *direction, long int bytes,
} }
s = td.tv_sec + (td.tv_usec / 1000000.); s = td.tv_sec + (td.tv_usec / 1000000.);
bs = bytes / (s?s:1); bs = bytes / (s?s:1);
printf("%ld bytes %s in %.3g seconds (%ld bytes/s)\n", if(bs >= 1048576){
bytes, direction, s, bs); bs /= 1048576;
unit = "M";
prec = 2;
}else if(bs >= 1024){
bs /= 1024;
unit = "k";
prec = 1;
}else{
unit = "";
prec = 0;
}
printf("%ld bytes %s in %.3g seconds (%.*f %sbytes/s)\n",
bytes, direction, s, prec, bs, unit);
} }
} }