Starting ALTQ in NPF

starting ALTQ is fully handed over to the kernel. when you start NPF, it checks if altq is loaded and not already running.

if ALTQ is already running, it ignores it.

Author: Emmankoko

sys/net/npf/npf_altq.c

@@ -23,6 +23,7 @@ struct npf_altqqueue  npf_altqs[2];
 
 struct pool		 npf_altq_pl;
 int npf_altq_loaded = 0;
+bool npf_altq_running = false;
 
 /* npf interface to start altq */
 void
@@ -179,4 +180,44 @@ npf_get_altqs(void *data)
 	return 0 ;
 }
 
+int
+npf_altq_start(void)
+{
+	int error;
+    struct npf_altq		*altq;
+    /* enable all altq interfaces on active list */
+    TAILQ_FOREACH(altq, npf_altqs_active, entries) {
+        if (altq->qname[0] == 0) {
+            error = npf_enable_altq(altq);
+            if (error != 0)
+                break;
+        }
+    }
+
+	return error;
+}
+
+int
+npf_enable_altq(struct npf_altq *altq)
+{
+	struct ifnet		*ifp;
+	struct tb_profile	 tb;
+	int			 s, error = 0;
+	if ((ifp = ifunit(altq->ifname)) == NULL)
+		return EINVAL;
+	if (ifp->if_snd.altq_type != ALTQT_NONE)
+		error = altq_enable(&ifp->if_snd);
+	/* set tokenbucket regulator */
+	if (error == 0 && ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {
+		tb.rate = altq->ifbandwidth;
+		tb.depth = altq->tbrsize;
+		s = splnet();
+		error = tbr_set(&ifp->if_snd, &tb);
+		splx(s);
+	}
+	if (error == 0)
+		npf_altq_running = true;
+	return error;
+}
+
 #endif /* ALTQ */

sys/net/npf/npf_altq.h

@@ -119,12 +119,15 @@ struct npf_tagname {
 TAILQ_HEAD(npf_altqqueue, npf_altq);
 
 extern int npf_altq_loaded;
+extern bool npf_altq_running;
 
 extern int	npf_get_altqs(void *);
 extern void	npf_altq_init(void);
 extern int	npf_begin_altq(void);
 extern int	npf_add_altq(void *);
 void 	npf_qid_unref(uint32_t);
 extern uint32_t	npf_qname2qid(char *);
+int	npf_altq_start(void);
+int	npf_enable_altq(struct npf_altq *);
 
 #endif /* NPF_ALTQ_H_ */

sys/net/npf/npf_os.c

@@ -248,7 +248,12 @@ npfctl_switch(void *data)
 	if (onoff) {
 		/* Enable: add pfil hooks. */
 		error = npf_pfil_register(false);
+#ifdef ALTQ
+		if (!npf_altq_running && npf_altq_loaded)
+			error = npf_altq_start();
+#endif /* ALTQ */
 	} else {
+
 		/* Disable: remove pfil hooks. */
 		npf_pfil_unregister(false);
 		error = 0;