123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270 |
- --- a/src/arpd/io.c
- +++ b/src/arpd/io.c
- @@ -277,7 +277,8 @@ static void accept_new(void)
- struct atm_qos qos;
- ENTRY *entry;
- VCC *vcc;
- - int fd,len,size,error;
- + int fd,error;
- + socklen_t len,size;
-
- len = sizeof(addr);
- if ((fd = accept(incoming,(struct sockaddr *) &addr,&len)) < 0) {
- @@ -614,7 +615,8 @@ int ip_itf_info(int number,uint32_t *ip,
-
- int get_local(int fd,struct sockaddr_atmsvc *addr)
- {
- - int length,result;
- + int result;
- + size_t length;
-
- length = sizeof(struct sockaddr_atmsvc);
- result = getsockname(fd,(struct sockaddr *) addr,&length);
- --- a/src/arpd/table.c
- +++ b/src/arpd/table.c
- @@ -101,7 +101,8 @@ static void dump_vcc(VCC *vcc)
- char addr_buf[MAX_ATM_ADDR_LEN+1];
- char qos_buf[MAX_ATM_QOS_LEN+1];
- struct atm_qos qos;
- - int size,sndbuf;
- + int sndbuf;
- + socklen_t size;
-
- size = sizeof(addr);
- if (getpeername(vcc->fd,(struct sockaddr *) &addr,&size) < 0) {
- --- a/src/ilmid/asn1/asn_int.c
- +++ b/src/ilmid/asn1/asn_int.c
- @@ -185,7 +185,7 @@ FILE* f _AND_
- AsnInt* v _AND_
- unsigned short int indent)
- {
- - fprintf(f,"%d", *v);
- + fprintf(f,"%ld", *v);
- }
-
-
- @@ -370,5 +370,5 @@ FILE* f _AND_
- UAsnInt* v _AND_
- unsigned short int indent)
- {
- - fprintf(f,"%u", *v);
- + fprintf(f,"%lu", *v);
- }
- --- a/src/ilmid/asn1/asn_oid.c
- +++ b/src/ilmid/asn1/asn_oid.c
- @@ -127,7 +127,7 @@ unsigned short int indent)
- if (firstArcNum > 2)
- firstArcNum = 2;
-
- - fprintf(f,"%u %u", firstArcNum, arcNum - (firstArcNum * 40));
- + fprintf(f,"%d %lu", firstArcNum, arcNum - (firstArcNum * 40));
-
- for (; i < v->octetLen ; )
- {
- @@ -136,7 +136,7 @@ unsigned short int indent)
-
- arcNum = (arcNum << 7) + (v->octs[i] & 0x7f);
- i++;
- - fprintf(f," %u", arcNum);
- + fprintf(f," %lu", arcNum);
- }
- fprintf(f,"}");
-
- --- a/src/lane/connect.c
- +++ b/src/lane/connect.c
- @@ -258,7 +258,8 @@ static int
- data_handler(const Event_t *event, void *funcdata)
- {
- Conn_t *tmp, *newconn;
- - int fd, nbytes;
- + int fd;
- + socklen_t nbytes;
- static char buffer[BUFSIZE];
- LaneControl_t *ctmp;
- struct sockaddr_atmsvc addr;
- --- a/src/lane/connect_bus.c
- +++ b/src/lane/connect_bus.c
- @@ -170,7 +170,8 @@ static int
- data_handler(const Event_t *event, void *funcdata)
- {
- Conn_t *tmp, *newconn;
- - int fd, nbytes;
- + int fd;
- + socklen_t nbytes;
- static char buffer[BUFSIZE];
- struct sockaddr_atmsvc addr;
-
- --- a/src/lane/lane_atm.c
- +++ b/src/lane/lane_atm.c
- @@ -138,7 +138,7 @@ atm_connect_back(const AtmAddr_t *our_ad
- struct atm_blli blli;
- struct atm_qos qos;
- int fd, ret;
- - int len = sizeof(address);
- + socklen_t len = sizeof(address);
-
- fd = socket(PF_ATMSVC, SOCK_DGRAM, 0);
- if (fd <0) {
- --- a/src/lane/lecs.c
- +++ b/src/lane/lecs.c
- @@ -119,7 +119,7 @@ int main(int argc, char **argv)
- int just_dump=0;
- fd_set fds;
- struct sockaddr_atmsvc client;
- - int len;
- + socklen_t len;
- unsigned char buffer[P_SIZE];
-
- while(i!=-1) {
- --- a/src/lib/ans.c
- +++ b/src/lib/ans.c
- @@ -41,7 +41,7 @@
- static int ans(const char *text,int wanted,void *result,int res_len)
- {
- unsigned char answer[MAX_ANSWER];
- - unsigned char name[MAX_NAME];
- + char name[MAX_NAME];
- unsigned char *pos,*data,*found;
- int answer_len,name_len,data_len,found_len;
- int questions,answers;
- --- a/src/lib/sdu2cell.c
- +++ b/src/lib/sdu2cell.c
- @@ -15,7 +15,8 @@ int sdu2cell(int s,int sizes,const int *
- {
- struct atm_qos qos;
- int trailer,total,cells;
- - int size,i;
- + int i;
- + socklen_t size;
-
- size = sizeof(qos);
- if (getsockopt(s,SOL_AAL,SO_ATMQOS,&qos,&size) < 0) return -1;
- --- a/src/lib/unix.c
- +++ b/src/lib/unix.c
- @@ -63,8 +63,8 @@ int un_attach(const char *path)
- int un_recv_connect(int s,void *buf,int size)
- {
- struct sockaddr_un addr;
- - int addr_size;
- int len;
- + socklen_t addr_size;
-
- addr_size = sizeof(addr);
- len = recvfrom(s,buf,size,0,(struct sockaddr *) &addr,&addr_size);
- --- a/src/maint/atmtcp.c
- +++ b/src/maint/atmtcp.c
- @@ -817,7 +817,8 @@ int main(int argc,char **argv)
- }
- else if (!strcmp(ARG,"listen") ||
- (do_background = !strcmp(ARG,"listen-bg"))) {
- - int fd,port,addr_len;
- + int fd,port;
- + socklen_t addr_len;
- int *fd2 = alloc_t(int);
-
- if ((fd = socket(PF_INET,SOCK_STREAM,0)) < 0) {
- --- a/src/maint/hediag.c
- +++ b/src/maint/hediag.c
- @@ -1,6 +1,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
- +#include <string.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- --- a/src/mpoad/io.c
- +++ b/src/mpoad/io.c
- @@ -521,7 +521,8 @@ static int msg_from_mps(int slot)
- static int accept_conn(int slot)
- {
- struct sockaddr_atmsvc sa;
- - int i, new_fd, sa_len;
- + int i, new_fd;
- + socklen_t sa_len;
-
- sa_len = sizeof(sa);
- new_fd = accept(fds[slot].fd, (struct sockaddr *)&sa, &sa_len);
- --- a/src/sigd/io.c
- +++ b/src/sigd/io.c
- @@ -355,7 +355,7 @@ int get_pvc(int itf,int *vci)
- error = 0;
- if (bind(s,(struct sockaddr *) &addr,sizeof(addr)) < 0) error = errno;
- else {
- - int size;
- + socklen_t size;
-
- size = sizeof(addr);
- if (getsockname(s,(struct sockaddr *) &addr,&size) < 0)
- --- a/src/test/ttcp.c
- +++ b/src/test/ttcp.c
- @@ -92,7 +92,8 @@ struct sockaddr_in frominet;
- struct sockaddr_atmsvc satm;
- struct atm_qos qos;
-
- -int domain, fromlen;
- +int domain;
- +socklen_t fromlen;
- int fd; /* fd of network socket */
-
- int buflen = 8 * 1024; /* length of buffer */
- @@ -466,7 +467,7 @@ int no_check = 0;
-
- {
- struct sockaddr_atmsvc peer;
- - int peerlen = sizeof(peer);
- + socklen_t peerlen = sizeof(peer);
- if (getpeername(fd, (struct sockaddr *) &peer,
- &peerlen) < 0) {
- err("getpeername");
- @@ -498,7 +499,7 @@ int no_check = 0;
- /* set socket buffer size */
- #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
- if (sockbufsize) {
- - int len;
- + socklen_t len;
-
- if (trans) {
- /* set send socket buffer if we are transmitting */
- --- a/src/mpoad/mpcd.8
- +++ b/src/mpoad/mpcd.8
- @@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A
- .B ]]
- .SH DESCRIPTION
- MPOA client
- -.SM(MPC) is responsible for creating and receiving
- +.SM (MPC) is responsible for creating and receiving
- internetwork layer shortcuts. Using these shortcuts MPCs forward
- unicast internetwork layer packets effectively over ATM without need
- for routing protocols.
- @@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o
- shortcuts is done with the help of
- .SM MPOA
- server
- -.SM(MPS).
- +.SM (MPS).
- .PP
- Just as the Linux
- .SM LAN
- --- a/src/led/zeppelin.8
- +++ b/src/led/zeppelin.8
- @@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using
- recommended. Token Ring support has received less testing than its
- Ethernet counterpart.
- .SH FILES
- -.IP \fI/var/run/lec[interface number].pid\fP
- +.IP \fI/var/run/lec[interface\ number].pid\fP
- The file containing the process id of zeppelin.
- .SH BUGS
- John Bonham died 1980 and Led Zeppelin broke.
- --- a/src/sigd/atmsigd.conf.4
- +++ b/src/sigd/atmsigd.conf.4
- @@ -125,7 +125,7 @@ a comment. The `#' character cannot be e
- .P
- If an option is specified in \fBatmsigd.conf\fP and on the command
- line, the command line has priority.
- -.COMPATIBILITY
- +.SH COMPATIBILITY
- Certain options used by past versions of \fBatmsigd\fP but no longer documented
- on the man page are still recognized and supported, but they also yield a
- warning message. Future versions of \fBatmsigd\fP will not recognize those
|