From 10f9fcc036b9fc449812c1171ec19d8313237284 Mon Sep 17 00:00:00 2001 From: harti Date: Mon, 26 Jan 2004 14:53:16 +0000 Subject: Make ng_source to work with non-ethernet interfaces. We do this by introducing a START_NOW command. This command does not send and GET_IFINDEX message downstream (to wait for the response from the ETHERNET node), but directly starts the sending process. This allows one to generate traffic as input for any hook on any node. --- sys/netgraph/ng_source.c | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) (limited to 'sys/netgraph') diff --git a/sys/netgraph/ng_source.c b/sys/netgraph/ng_source.c index 1526993..25f3aa0 100644 --- a/sys/netgraph/ng_source.c +++ b/sys/netgraph/ng_source.c @@ -189,6 +189,13 @@ static const struct ng_cmdlist ng_source_cmds[] = { NULL, NULL }, + { + NGM_SOURCE_COOKIE, + NGM_SOURCE_START_NOW, + "start_now", + &ng_parse_uint64_type, + NULL + }, { 0 } }; @@ -317,6 +324,30 @@ ng_source_rcvmsg(node_p node, item_p item, hook_p lasthook) ng_source_start(sc); } break; + case NGM_SOURCE_START_NOW: + { + u_int64_t packets = *(u_int64_t *)msg->data; + if (sc->output.hook == NULL) { + printf("%s: start on node with no output hook\n" + , __FUNCTION__); + error = EINVAL; + break; + } + if (sc->node->nd_flags & NG_SOURCE_ACTIVE) { + error = EBUSY; + break; + } + /* TODO validation of packets */ + sc->packets = packets; + sc->output_ifp = NULL; + + sc->node->nd_flags |= NG_SOURCE_ACTIVE; + timevalclear(&sc->stats.elapsedTime); + timevalclear(&sc->stats.endTime); + getmicrotime(&sc->stats.startTime); + sc->intr_ch = timeout(ng_source_intr, sc, 0); + } + break; case NGM_SOURCE_STOP: ng_source_stop(sc); break; @@ -600,8 +631,12 @@ ng_source_intr (void *arg) return; } - ifq = &sc->output_ifp->if_snd; - packets = ifq->ifq_maxlen - ifq->ifq_len; + if (sc->output_ifp != NULL) { + ifq = &sc->output_ifp->if_snd; + packets = ifq->ifq_maxlen - ifq->ifq_len; + } else + packets = sc->snd_queue.ifq_len; + ng_source_send(sc, packets, NULL); if (sc->packets == 0) { int s = splnet(); -- cgit v1.1