Root/package/linux-atm/patches/000-debian_16.patch

1--- a/src/arpd/io.c
2+++ b/src/arpd/io.c
3@@ -277,7 +277,8 @@ static void accept_new(void)
4     struct atm_qos qos;
5     ENTRY *entry;
6     VCC *vcc;
7- int fd,len,size,error;
8+ int fd,error;
9+ socklen_t len,size;
10 
11     len = sizeof(addr);
12     if ((fd = accept(incoming,(struct sockaddr *) &addr,&len)) < 0) {
13@@ -614,7 +615,8 @@ int ip_itf_info(int number,uint32_t *ip,
14 
15 int get_local(int fd,struct sockaddr_atmsvc *addr)
16 {
17- int length,result;
18+ int result;
19+ size_t length;
20 
21     length = sizeof(struct sockaddr_atmsvc);
22     result = getsockname(fd,(struct sockaddr *) addr,&length);
23--- a/src/arpd/table.c
24+++ b/src/arpd/table.c
25@@ -101,7 +101,8 @@ static void dump_vcc(VCC *vcc)
26     char addr_buf[MAX_ATM_ADDR_LEN+1];
27     char qos_buf[MAX_ATM_QOS_LEN+1];
28     struct atm_qos qos;
29- int size,sndbuf;
30+ int sndbuf;
31+ socklen_t size;
32 
33     size = sizeof(addr);
34     if (getpeername(vcc->fd,(struct sockaddr *) &addr,&size) < 0) {
35--- a/src/ilmid/asn1/asn_int.c
36+++ b/src/ilmid/asn1/asn_int.c
37@@ -185,7 +185,7 @@ FILE* f _AND_
38 AsnInt* v _AND_
39 unsigned short int indent)
40 {
41- fprintf(f,"%d", *v);
42+ fprintf(f,"%ld", *v);
43 }
44 
45 
46@@ -370,5 +370,5 @@ FILE* f _AND_
47 UAsnInt* v _AND_
48 unsigned short int indent)
49 {
50- fprintf(f,"%u", *v);
51+ fprintf(f,"%lu", *v);
52 }
53--- a/src/ilmid/asn1/asn_oid.c
54+++ b/src/ilmid/asn1/asn_oid.c
55@@ -127,7 +127,7 @@ unsigned short int indent)
56     if (firstArcNum > 2)
57         firstArcNum = 2;
58 
59- fprintf(f,"%u %u", firstArcNum, arcNum - (firstArcNum * 40));
60+ fprintf(f,"%d %lu", firstArcNum, arcNum - (firstArcNum * 40));
61 
62     for (; i < v->octetLen ; )
63     {
64@@ -136,7 +136,7 @@ unsigned short int indent)
65 
66         arcNum = (arcNum << 7) + (v->octs[i] & 0x7f);
67         i++;
68- fprintf(f," %u", arcNum);
69+ fprintf(f," %lu", arcNum);
70     }
71     fprintf(f,"}");
72 
73--- a/src/lane/connect.c
74+++ b/src/lane/connect.c
75@@ -258,7 +258,8 @@ static int
76 data_handler(const Event_t *event, void *funcdata)
77 {
78   Conn_t *tmp, *newconn;
79- int fd, nbytes;
80+ int fd;
81+ socklen_t nbytes;
82   static char buffer[BUFSIZE];
83   LaneControl_t *ctmp;
84   struct sockaddr_atmsvc addr;
85--- a/src/lane/connect_bus.c
86+++ b/src/lane/connect_bus.c
87@@ -170,7 +170,8 @@ static int
88 data_handler(const Event_t *event, void *funcdata)
89 {
90   Conn_t *tmp, *newconn;
91- int fd, nbytes;
92+ int fd;
93+ socklen_t nbytes;
94   static char buffer[BUFSIZE];
95   struct sockaddr_atmsvc addr;
96 
97--- a/src/lane/lane_atm.c
98+++ b/src/lane/lane_atm.c
99@@ -138,7 +138,7 @@ atm_connect_back(const AtmAddr_t *our_ad
100   struct atm_blli blli;
101   struct atm_qos qos;
102   int fd, ret;
103- int len = sizeof(address);
104+ socklen_t len = sizeof(address);
105   
106   fd = socket(PF_ATMSVC, SOCK_DGRAM, 0);
107   if (fd <0) {
108--- a/src/lane/lecs.c
109+++ b/src/lane/lecs.c
110@@ -119,7 +119,7 @@ int main(int argc, char **argv)
111   int just_dump=0;
112   fd_set fds;
113   struct sockaddr_atmsvc client;
114- int len;
115+ socklen_t len;
116   unsigned char buffer[P_SIZE];
117 
118   while(i!=-1) {
119--- a/src/lib/ans.c
120+++ b/src/lib/ans.c
121@@ -41,7 +41,7 @@
122 static int ans(const char *text,int wanted,void *result,int res_len)
123 {
124     unsigned char answer[MAX_ANSWER];
125- unsigned char name[MAX_NAME];
126+ char name[MAX_NAME];
127     unsigned char *pos,*data,*found;
128     int answer_len,name_len,data_len,found_len;
129     int questions,answers;
130--- a/src/lib/sdu2cell.c
131+++ b/src/lib/sdu2cell.c
132@@ -15,7 +15,8 @@ int sdu2cell(int s,int sizes,const int *
133 {
134     struct atm_qos qos;
135     int trailer,total,cells;
136- int size,i;
137+ int i;
138+ socklen_t size;
139 
140     size = sizeof(qos);
141     if (getsockopt(s,SOL_AAL,SO_ATMQOS,&qos,&size) < 0) return -1;
142--- a/src/lib/unix.c
143+++ b/src/lib/unix.c
144@@ -63,8 +63,8 @@ int un_attach(const char *path)
145 int un_recv_connect(int s,void *buf,int size)
146 {
147     struct sockaddr_un addr;
148- int addr_size;
149     int len;
150+ socklen_t addr_size;
151 
152     addr_size = sizeof(addr);
153     len = recvfrom(s,buf,size,0,(struct sockaddr *) &addr,&addr_size);
154--- a/src/maint/atmtcp.c
155+++ b/src/maint/atmtcp.c
156@@ -817,7 +817,8 @@ int main(int argc,char **argv)
157     }
158     else if (!strcmp(ARG,"listen") ||
159       (do_background = !strcmp(ARG,"listen-bg"))) {
160- int fd,port,addr_len;
161+ int fd,port;
162+ socklen_t addr_len;
163         int *fd2 = alloc_t(int);
164 
165         if ((fd = socket(PF_INET,SOCK_STREAM,0)) < 0) {
166--- a/src/maint/hediag.c
167+++ b/src/maint/hediag.c
168@@ -1,6 +1,7 @@
169 #include <stdio.h>
170 #include <stdlib.h>
171 #include <unistd.h>
172+#include <string.h>
173 #include <sys/ioctl.h>
174 #include <sys/types.h>
175 #include <sys/socket.h>
176--- a/src/mpoad/io.c
177+++ b/src/mpoad/io.c
178@@ -521,7 +521,8 @@ static int msg_from_mps(int slot)
179 static int accept_conn(int slot)
180 {
181         struct sockaddr_atmsvc sa;
182- int i, new_fd, sa_len;
183+ int i, new_fd;
184+ socklen_t sa_len;
185 
186         sa_len = sizeof(sa);
187         new_fd = accept(fds[slot].fd, (struct sockaddr *)&sa, &sa_len);
188--- a/src/sigd/io.c
189+++ b/src/sigd/io.c
190@@ -355,7 +355,7 @@ int get_pvc(int itf,int *vci)
191     error = 0;
192     if (bind(s,(struct sockaddr *) &addr,sizeof(addr)) < 0) error = errno;
193     else {
194- int size;
195+ socklen_t size;
196 
197     size = sizeof(addr);
198     if (getsockname(s,(struct sockaddr *) &addr,&size) < 0)
199--- a/src/test/ttcp.c
200+++ b/src/test/ttcp.c
201@@ -92,7 +92,8 @@ struct sockaddr_in frominet;
202 struct sockaddr_atmsvc satm;
203 struct atm_qos qos;
204 
205-int domain, fromlen;
206+int domain;
207+socklen_t fromlen;
208 int fd; /* fd of network socket */
209 
210 int buflen = 8 * 1024; /* length of buffer */
211@@ -466,7 +467,7 @@ int no_check = 0;
212         
213         {
214         struct sockaddr_atmsvc peer;
215- int peerlen = sizeof(peer);
216+ socklen_t peerlen = sizeof(peer);
217         if (getpeername(fd, (struct sockaddr *) &peer,
218                 &peerlen) < 0) {
219             err("getpeername");
220@@ -498,7 +499,7 @@ int no_check = 0;
221     /* set socket buffer size */
222 #if defined(SO_SNDBUF) || defined(SO_RCVBUF)
223     if (sockbufsize) {
224- int len;
225+ socklen_t len;
226 
227     if (trans) {
228         /* set send socket buffer if we are transmitting */
229--- a/src/mpoad/mpcd.8
230+++ b/src/mpoad/mpcd.8
231@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A
232 .B ]]
233 .SH DESCRIPTION
234 MPOA client
235-.SM(MPC) is responsible for creating and receiving
236+.SM (MPC) is responsible for creating and receiving
237 internetwork layer shortcuts. Using these shortcuts MPCs forward
238 unicast internetwork layer packets effectively over ATM without need
239 for routing protocols.
240@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o
241 shortcuts is done with the help of
242 .SM MPOA
243 server
244-.SM(MPS).
245+.SM (MPS).
246 .PP
247 Just as the Linux
248 .SM LAN
249--- a/src/led/zeppelin.8
250+++ b/src/led/zeppelin.8
251@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using
252 recommended. Token Ring support has received less testing than its
253 Ethernet counterpart.
254 .SH FILES
255-.IP \fI/var/run/lec[interface number].pid\fP
256+.IP \fI/var/run/lec[interface\ number].pid\fP
257 The file containing the process id of zeppelin.
258 .SH BUGS
259 John Bonham died 1980 and Led Zeppelin broke.
260--- a/src/sigd/atmsigd.conf.4
261+++ b/src/sigd/atmsigd.conf.4
262@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e
263 .P
264 If an option is specified in \fBatmsigd.conf\fP and on the command
265 line, the command line has priority.
266-.COMPATIBILITY
267+.SH COMPATIBILITY
268 Certain options used by past versions of \fBatmsigd\fP but no longer documented
269 on the man page are still recognized and supported, but they also yield a
270 warning message. Future versions of \fBatmsigd\fP will not recognize those
271

Archive Download this file



interactive