Application of mopd-2.5.3-proto.patch:

* Fri Oct 26 2001 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
- updated the proto, select, aout and syslog patches due to
  file location rearrangements (proto, select, aout, syslog)

* Sat Feb  5 2000 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
- replaced the string patch with a more general prototype fix
  (proto)

Downloaded from:
ftp://ftp.linux-mips.org/pub/linux/mips/people/macro/mopd/mopd-2.5.3-proto.patch.gz
.patch SHA256 = 45e6a6ef14830ae32ca69b2ce5429ca86454f65e6526e86bd0db5cebf728bcd0
Patch history copied from:
ftp://ftp.linux-mips.org/pub/linux/mips/people/macro/mopd/mopd-2.5.3-15.spec
This commit is contained in:
Maciej W. Rozycki
2001-10-26 12:00:00 -04:00
committed by Boris Gjenero
parent 2a42d24d4f
commit d595ac63f4
8 changed files with 17 additions and 9 deletions

View File

@@ -34,6 +34,7 @@ static char rcsid[] = "$Id: device.c,v 1.21 1996/08/08 00:00:59 moj Exp $";
#include "os.h"
#include "common.h"
#include "mopdef.h"
#include "pf.h"
struct if_info *iflist; /* Interface List */
@@ -319,7 +320,7 @@ deviceInitAll()
ifc.ifc_len = sizeof ibuf;
ifc.ifc_buf = (caddr_t)ibuf;
if (ioctl(fd, SIOCGIFCONF, (char *)&ifc) < 0 ||
ifc.ifc_len < sizeof(struct ifreq)) {
ifc.ifc_len < (int)sizeof(struct ifreq)) {
syslog(LOG_ERR, "deviceInitAll: old SIOCGIFCONF: %m");
exit(1);
}

View File

@@ -43,7 +43,7 @@ mopDumpDL(fd, pkt, trans)
int trans;
{
int i,index = 0;
long tmpl;
u_int tmpl;
u_char tmpc,c,program[257],code,*ucp;
int len,tmps,moplen;

View File

@@ -32,6 +32,7 @@ static char rcsid[] = "$Id: get.c,v 1.5 1996/03/31 18:50:14 moj Exp $";
#endif
#include <sys/types.h>
#include <netinet/in.h>
#include "mopdef.h"
u_char
@@ -58,7 +59,7 @@ mopGetShort(pkt, index)
return(ret);
}
u_long
u_int
mopGetLong(pkt, index)
register u_char *pkt;
register int *index;

View File

@@ -36,7 +36,7 @@
#ifdef NO__P
u_char mopGetChar (/* u_char *, int * */);
u_short mopGetShort (/* u_char *, int * */);
u_long mopGetLong (/* u_char *, int * */);
u_int mopGetLong (/* u_char *, int * */);
void mopGetMulti (/* u_char *, int *,u_char *,int */);
int mopGetTrans (/* u_char *, int */);
void mopGetHeader (/* u_char *, int *, u_char **, u_char **, u_short *,
@@ -46,7 +46,7 @@ u_short mopGetLength (/* u_char *, int */);
__BEGIN_DECLS
u_char mopGetChar __P((u_char *,int *));
u_short mopGetShort __P((u_char *,int *));
u_long mopGetLong __P((u_char *,int *));
u_int mopGetLong __P((u_char *,int *));
void mopGetMulti __P((u_char *,int *,u_char *,int));
int mopGetTrans __P((u_char *, int));
void mopGetHeader __P((u_char *, int *, u_char **, u_char **, u_short *,

View File

@@ -36,7 +36,7 @@
#ifdef NO__P
int pfTrans (/* char * */);
int pfInit (/* char *, int, u_short, int */);
int pfEthAddr (/* int, u_char * */);
int pfEthAddr (/* int, char *, u_char * */);
int pfAddMulti (/* int, char *, char * */);
int pfDelMulti (/* int, char *, char * */);
int pfRead (/* int, u_char *, int */);
@@ -45,7 +45,7 @@ int pfWrite (/* int, u_char *, int, int */);
__BEGIN_DECLS
int pfTrans __P((char *));
int pfInit __P((char *, int, u_short, int));
int pfEthAddr __P((int, u_char *));
int pfEthAddr __P((int, char *, u_char *));
int pfAddMulti __P((int, char *, char *));
int pfDelMulti __P((int, char *, char *));
int pfRead __P((int, u_char *, int));

View File

@@ -43,7 +43,7 @@ mopDumpRC(fd, pkt, trans)
int trans;
{
int i,index = 0;
long tmpl;
u_int tmpl;
u_char tmpc,code,control;
int len,tmps,moplen;

View File

@@ -164,7 +164,7 @@ main(argc, argv)
void
Usage()
{
(void) fprintf(stderr, "usage: %d [-a] [-v] [filename...]\n",Program);
fprintf(stderr, "usage: %s [-a] [-v] [filename...]\n", Program);
exit(1);
}

View File

@@ -56,6 +56,12 @@ struct dllist dllist[MAXDL]; /* dump/load list */
extern char dl_mcst[]; /* Dump/Load Multicast */
extern char rc_mcst[]; /* Remote Console Multicast */
#ifdef NO__P
ssize_t mopFileRead (/* struct dllist *, u_char * */);
#else
ssize_t mopFileRead __P((struct dllist *, u_char *));
#endif
void
mopProcessInfo(pkt,index,moplen,dl_rpr,trans)
u_char *pkt;