Deleted Added
full compact
34c34
< * $FreeBSD: head/sbin/ifconfig/ifconfig.h 127649 2004-03-30 22:59:22Z sam $
---
> * $FreeBSD: head/sbin/ifconfig/ifconfig.h 138593 2004-12-08 19:18:07Z sam $
37c37
< extern struct ifreq ifr;
---
> #define __constructor __attribute__((constructor))
39,41d38
< extern char name[IFNAMSIZ]; /* name of interface */
< extern int allmedia;
< extern int supmedia;
42a40
> struct cmd;
44,48c42,43
< extern void setmedia(const char *, int, int, const struct afswtch *rafp);
< extern void setmediamode(const char *, int, int, const struct afswtch *rafp);
< extern void setmediaopt(const char *, int, int, const struct afswtch *rafp);
< extern void unsetmediaopt(const char *, int, int, const struct afswtch *rafp);
< extern void media_status(int s, struct rt_addrinfo *);
---
> typedef void c_func(const char *cmd, int arg, int s, const struct afswtch *afp);
> typedef void c_func2(const char *arg1, const char *arg2, int s, const struct afswtch *afp);
50,53c45,57
< extern void setvlantag(const char *, int, int, const struct afswtch *rafp);
< extern void setvlandev(const char *, int, int, const struct afswtch *rafp);
< extern void unsetvlandev(const char *, int, int, const struct afswtch *rafp);
< extern void vlan_status(int s, struct rt_addrinfo *);
---
> struct cmd {
> const char *c_name;
> int c_parameter;
> #define NEXTARG 0xffffff /* has following arg */
> #define NEXTARG2 0xfffffe /* has 2 following args */
> #define OPTARG 0xfffffd /* has optional following arg */
> union {
> c_func *c_func;
> c_func2 *c_func2;
> };
> struct cmd *c_next;
> };
> void cmd_register(struct cmd *);
55,72c59,130
< extern void set80211ssid(const char *, int, int, const struct afswtch *rafp);
< extern void set80211stationname(const char *, int, int, const struct afswtch *rafp);
< extern void set80211channel(const char *, int, int, const struct afswtch *rafp);
< extern void set80211authmode(const char *, int, int, const struct afswtch *rafp);
< extern void set80211powersave(const char *, int, int, const struct afswtch *rafp);
< extern void set80211powersavemode(const char *, int, int, const struct afswtch *rafp);
< extern void set80211powersavesleep(const char *, int, int, const struct afswtch *rafp);
< extern void set80211wepmode(const char *, int, int, const struct afswtch *rafp);
< extern void set80211wep(const char *, int, int, const struct afswtch *rafp);
< extern void set80211weptxkey(const char *, int, int, const struct afswtch *rafp);
< extern void set80211wepkey(const char *, int, int, const struct afswtch *rafp);
< extern void set80211nwkey(const char *, int, int, const struct afswtch *rafp);
< extern void set80211rtsthreshold(const char *, int, int, const struct afswtch *rafp);
< extern void set80211protmode(const char *, int, int, const struct afswtch *rafp);
< extern void set80211txpower(const char *, int, int, const struct afswtch *rafp);
< extern void ieee80211_status(int s, struct rt_addrinfo *);
< extern void maclabel_status(int s, struct rt_addrinfo *);
< extern void setifmaclabel(const char *, int, int, const struct afswtch *rafp);
---
> /*
> * Macros for declaring command functions and initializing entries.
> */
> #define DECL_CMD_FUNC(name, cmd, arg) \
> void name(const char *cmd, int arg, int s, const struct afswtch *afp)
> #define DECL_CMD_FUNC2(name, arg1, arg2) \
> void name(const char *arg1, const char *arg2, int s, const struct afswtch *afp)
>
> #define DEF_CMD(name, param, func) { name, param, { .c_func = func } }
> #define DEF_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func } }
> #define DEF_CMD_OPTARG(name, func) { name, OPTARG, { .c_func = func } }
> #define DEF_CMD_ARG2(name, func) { name, NEXTARG2, { .c_func2 = func } }
>
> struct rt_addrinfo;
> struct addrinfo;
>
> enum {
> RIDADDR,
> ADDR,
> MASK,
> DSTADDR,
> };
>
> struct afswtch {
> const char *af_name; /* as given on cmd line, e.g. "inet" */
> short af_af; /* AF_* */
> /* print status method */
> void (*af_status)(int, const struct rt_addrinfo *);
> /* parse address method */
> void (*af_getaddr)(const char *, int);
> /* parse prefix method (IPv6) */
> void (*af_getprefix)(const char *, int);
> void (*af_postproc)(int s, const struct afswtch *);
> u_long af_difaddr; /* set dst if address ioctl */
> u_long af_aifaddr; /* set if address ioctl */
> void *af_ridreq; /* */
> void *af_addreq; /* */
> struct afswtch *af_next;
>
> /* XXX doesn't fit model */
> void (*af_status_tunnel)(int);
> void (*af_settunnel)(int s, struct addrinfo *srcres,
> struct addrinfo *dstres);
> };
> void af_register(struct afswtch *);
>
> struct option {
> const char *opt;
> const char *opt_usage;
> void (*cb)(const char *arg);
> struct option *next;
> };
> void opt_register(struct option *);
>
> extern struct ifreq ifr;
> extern char name[IFNAMSIZ]; /* name of interface */
> extern int allmedia;
> extern int supmedia;
> extern int printname;
> extern int flags;
> extern int newaddr;
> extern int verbose;
> extern int setipdst;
>
> void setifcap(const char *, int value, int s, const struct afswtch *);
>
> void Perror(const char *cmd);
> void printb(const char *s, unsigned value, const char *bits);
>
> void ifmaybeload(char *name);
>
> void clone_create(void);