definition of altq_expand which sends npfioc_altq to kernel

it is implemented to compute all params of queues for any kind of scheduler

Author: Emmankoko

sys/net/npf/npf.h

@@ -330,6 +330,9 @@ struct npfioc_altq {
 #define	IOC_NPF_RULE		_IOWR('N', 107, nvlist_ref_t)
 #define	IOC_NPF_CONN_LOOKUP	_IOWR('N', 108, nvlist_ref_t)
 #define	IOC_NPF_TABLE_REPLACE	_IOWR('N', 109, nvlist_ref_t)
+#define IOC_NPF_BEGIN_ALTQ  _IO('N', 112)
+#define IOC_NPF_ADD_ALTQ	_IOWR('N', 110, struct npfioc_altq)
+#define IOC_NPF_GET_ALTQS	_IOWR('N', 111, struct npfioc_altq)
 
 /*
  * NPF error report.

sys/net/npf/npf_altq.h

@@ -104,4 +104,12 @@ struct npf_altq {
 	} pq_u;
 	u_int32_t		 qid;		/* return value */
 };
+
+TAILQ_HEAD(npf_altqqueue, npf_altq);
+
+extern int npf_get_altqs(void *);
+extern void npf_altq_init(void);
+extern int npf_begin_altq(void);
+extern int npf_add_altq(void *);
+
 #endif /* NPF_ALTQ_H_ */

sys/net/npf/npf_os.c

@@ -274,6 +274,7 @@ npf_dev_ioctl(dev_t dev, u_long cmd, void *data, int flag, lwp_t *l)
 		return npfctl_table(npf, data);
 	case IOC_NPF_STATS:
 		return npf_stats_export(npf, data);
+
 	case IOC_NPF_LOAD:
 	case IOC_NPF_SAVE:
 	case IOC_NPF_RULE:

usr.sbin/npf/npfctl/Makefile

@@ -7,14 +7,14 @@ MAN=		npfctl.8 npf.conf.5
 BINDIR=		/sbin
 
 SRCS=		npfctl.c npf_cmd.c npf_var.c npf_data.c npf_build.c
-SRCS+=		npf_bpf_comp.c npf_show.c npf_extmod.c
+SRCS+=		npf_bpf_comp.c npf_show.c npf_extmod.c npfctl_altq.c
 
 CPPFLAGS+=	-I${.CURDIR}
 SRCS+=		npf_scan.l npf_parse.y
 YHEADER=	1
 
-LDADD+=		-lnpf -lpcap -lutil -ly
-DPADD+=		${LIBNPF} ${LIBUTIL} ${LIBPCAP} ${LIBUTIL} ${LIBY}
+LDADD+=		-lnpf -lpcap -lutil -ly -lm
+DPADD+=		${LIBNPF} ${LIBUTIL} ${LIBPCAP} ${LIBUTIL} ${LIBY} ${LIBM}
 
 WARNS=		5
 

usr.sbin/npf/npfctl/npfctl.c

@@ -339,7 +339,7 @@ npfctl_load(int fd)
 	return errno;
 }
 
-static int
+int
 npfctl_open_dev(const char *path)
 {
 	struct stat st;

usr.sbin/npf/npfctl/npfctl.h

@@ -303,6 +303,31 @@ void		npfctl_build_table(const char *, u_int, const char *);
 
 void		npfctl_setparam(const char *, int);
 
+/* ALTQ related */
+int npfctl_test_altqsupport(int);
+extern int npfctl_open_dev(const char *);
+int npfctl_eval_bw(struct node_queue_bw *, char *);
+int	expand_altq(struct npf_altq *, const char *, struct node_queue *,
+	    struct node_queue_bw bwspec, struct node_queue_opt *);
+int	expand_queue(struct npf_altq *, const char *, struct node_queue *,
+	    struct node_queue_bw, struct node_queue_opt *);
+u_long get_ifmtu(char *);
+uint32_t get_ifspeed(char *);
+uint32_t npf_eval_bwspec(struct node_queue_bw *, uint32_t);
+void npfaltq_store(struct npf_altq *);
+int npfctl_add_altq(struct npf_altq *);
+int npf_eval_queue_opts(struct npf_altq *, struct node_queue_opt *,
+    uint32_t);
+int eval_npfaltq(struct npf_altq *, struct node_queue_bw *,
+    struct node_queue_opt *);
+int eval_npfqueue(struct npf_altq *, struct node_queue_bw *,
+    struct node_queue_opt *);
+struct npf_altq	*qname_to_npfaltq(const char *, const char *);
+uint32_t	 qname_to_qid(const char *);
+struct npf_altq *npfaltq_lookup(const char *ifname);
+char		*rate2str(double);
+int check_commit_altq(void);
+
 /*
  * For the systems which do not define TH_ECE and TW_CRW.
  */