d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix addr length argument value passed to sendto().

Browse Source 
Some inetd internal udp servers didn't worked with problem.
Also fix recvfrom() "fromlen" arg type from int * to socklen_t *.

Approved by: jkh

Submitted by: bde
This commit is contained in:
Yoshinobu Inoue 2000-03-09 15:07:38 +00:00
parent 0b6b4751b5
commit a9a948a9bb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.sbin/inetd/builtins.c
View File

@ -113,7 +113,8 @@ chargen_dg(s, sep) /* Character generator */
{ {
struct sockaddr_storage ss; struct sockaddr_storage ss;
static char *rs; static char *rs;
int len, size; int len;
socklen_t size;
char text[LINESIZ+2]; char text[LINESIZ+2];
if (endring == 0) { if (endring == 0) {
@ -139,8 +140,7 @@ chargen_dg(s, sep) /* Character generator */
rs = ring; rs = ring;
text[LINESIZ] = '\r'; text[LINESIZ] = '\r';
text[LINESIZ + 1] = '\n'; text[LINESIZ + 1] = '\n';
(void) sendto(s, text, sizeof(text), 0, (void) sendto(s, text, sizeof(text), 0, (struct sockaddr *)&ss, size);
(struct sockaddr *)&ss, sizeof(ss));
} }
/* ARGSUSED */ /* ARGSUSED */
@ -190,7 +190,7 @@ daytime_dg(s, sep) /* Return human-readable time of day */
char buffer[256]; char buffer[256];
time_t clock; time_t clock;
struct sockaddr_storage ss; struct sockaddr_storage ss;
int size; socklen_t size;
clock = time((time_t *) 0); clock = time((time_t *) 0);
@ -204,7 +204,7 @@ daytime_dg(s, sep) /* Return human-readable time of day */
(void) sprintf(buffer, "%.24s\r\n", ctime(&clock)); (void) sprintf(buffer, "%.24s\r\n", ctime(&clock));
(void) sendto(s, buffer, strlen(buffer), 0, (void) sendto(s, buffer, strlen(buffer), 0,
(struct sockaddr *)&ss, sizeof(ss)); (struct sockaddr *)&ss, size);
} }
/* ARGSUSED */ /* ARGSUSED */
@ -269,7 +269,8 @@ echo_dg(s, sep) /* Echo service -- echo data back */
struct servtab *sep; struct servtab *sep;
{ {
char buffer[BUFSIZE]; char buffer[BUFSIZE];
int i, size; int i;
socklen_t size;
struct sockaddr_storage ss; struct sockaddr_storage ss;
size = sizeof(ss); size = sizeof(ss);
@ -280,8 +281,7 @@ echo_dg(s, sep) /* Echo service -- echo data back */
if (check_loop((struct sockaddr *)&ss, sep)) if (check_loop((struct sockaddr *)&ss, sep))
return; return;
(void) sendto(s, buffer, i, 0, (struct sockaddr *)&ss, (void) sendto(s, buffer, i, 0, (struct sockaddr *)&ss, size);
sizeof(ss));
} }
/* ARGSUSED */ /* ARGSUSED */
@ -638,7 +638,7 @@ machtime_dg(s, sep)
{ {
unsigned long result; unsigned long result;
struct sockaddr_storage ss; struct sockaddr_storage ss;
int size; socklen_t size;
size = sizeof(ss); size = sizeof(ss);
if (recvfrom(s, (char *)&result, sizeof(result), 0, if (recvfrom(s, (char *)&result, sizeof(result), 0,
@ -650,7 +650,7 @@ machtime_dg(s, sep)
result = machtime(); result = machtime();
(void) sendto(s, (char *) &result, sizeof(result), 0, (void) sendto(s, (char *) &result, sizeof(result), 0,
(struct sockaddr *)&ss, sizeof(ss)); (struct sockaddr *)&ss, size);
} }
/* ARGSUSED */ /* ARGSUSED */