diff options
| author |   rzalamena <rzalamena@openbsd.org> | 2016-12-02 17:25:34 +0000 |
|---|---|---|
| committer | rzalamena <rzalamena@openbsd.org> | 2016-12-02 17:25:34 +0000 |
| commit | a249d8a4c0b89d00849065c5bab24af456b7988a (patch) | |
| tree | ccb011dbe350fa4944d75d1d289f306e331d93a1 /sys/net/switchofp.c | |
| parent | Fix some spelling errors in the OpenFlow header and update the tcpdump(8) (diff) | |
| download | wireguard-openbsd-a249d8a4c0b89d00849065c5bab24af456b7988a.tar.xz wireguard-openbsd-a249d8a4c0b89d00849065c5bab24af456b7988a.zip | |
Limit the amount of flows that can be installed on flow tables.
Diffstat (limited to 'sys/net/switchofp.c')
| -rw-r--r-- | sys/net/switchofp.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/net/switchofp.c b/sys/net/switchofp.c index f299eae1d30..7f83f12c52d 100644 --- a/sys/net/switchofp.c +++ b/sys/net/switchofp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: switchofp.c,v 1.42 2016/12/02 17:06:13 rzalamena Exp $ */ +/* $OpenBSD: switchofp.c,v 1.43 2016/12/02 17:25:34 rzalamena Exp $ */ /* * Copyright (c) 2016 Kazuya GODA <goda@openbsd.org> @@ -4866,6 +4866,7 @@ swofp_flow_entry_put_instructions(struct mbuf *m, int swofp_flow_mod_cmd_add(struct switch_softc *sc, struct mbuf *m) { + struct swofp_ofs *ofs = sc->sc_ofs; struct ofp_header *oh; struct ofp_flow_mod *ofm; struct ofp_match *om; @@ -4902,14 +4903,19 @@ swofp_flow_mod_cmd_add(struct switch_softc *sc, struct mbuf *m) goto ofp_error; } - /* Validate that the OXM are in-place and correct. */ - if (swofp_validate_flow_match(om, &error)) { - etype = OFP_ERRTYPE_BAD_MATCH; + if ((swft = swofp_flow_table_add(sc, ofm->fm_table_id)) == NULL) { + error = OFP_ERRFLOWMOD_TABLE_ID; goto ofp_error; } - if ((swft = swofp_flow_table_add(sc, ofm->fm_table_id)) == NULL) { - error = OFP_ERRFLOWMOD_TABLE_ID; + if (swft->swft_flow_num >= ofs->swofs_flow_max_entry) { + error = OFP_ERRFLOWMOD_TABLE_FULL; + goto ofp_error; + } + + /* Validate that the OXM are in-place and correct. */ + if (swofp_validate_flow_match(om, &error)) { + etype = OFP_ERRTYPE_BAD_MATCH; goto ofp_error; } |