diff options
Diffstat (limited to 'packet')
| -rw-r--r-- | packet/bgp.go | 18 | ||||
| -rw-r--r-- | packet/constant.go | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/packet/bgp.go b/packet/bgp.go index 3dd18be3..aeab46f8 100644 --- a/packet/bgp.go +++ b/packet/bgp.go @@ -2107,19 +2107,19 @@ func flowSpecTcpFlagParser(rf RouteFamily, args []string) (FlowSpecComponentInte ss = append(ss, v) } protos := strings.Join(ss, "|") - exp := regexp.MustCompile(fmt.Sprintf("^%s (((%s) )*)(%s)$", FlowSpecNameMap[FLOW_SPEC_TYPE_TCP_FLAG], protos, protos)) + exp := regexp.MustCompile(fmt.Sprintf("^%s ((((%s)\\&)*(%s) )*(((%s)\\&)*(%s)))$", FlowSpecNameMap[FLOW_SPEC_TYPE_TCP_FLAG], protos, protos, protos, protos)) elems := exp.FindStringSubmatch(strings.Join(args, " ")) + if len(elems) < 1 { + return nil, fmt.Errorf("invalid flag format") + } items := make([]*FlowSpecComponentItem, 0) - if elems[1] != "" { - for _, v := range strings.Split(elems[1], " ") { - p, ok := TCPFlagValueMap[v] - if !ok { - continue - } - items = append(items, NewFlowSpecComponentItem(0, int(p))) + for _, v := range strings.Split(elems[1], " ") { + flag := 0 + for _, e := range strings.Split(v, "&") { + flag |= int(TCPFlagValueMap[e]) } + items = append(items, NewFlowSpecComponentItem(0, flag)) } - items = append(items, NewFlowSpecComponentItem(0, int(TCPFlagValueMap[elems[4]]))) return NewFlowSpecComponent(FLOW_SPEC_TYPE_TCP_FLAG, items), nil } diff --git a/packet/constant.go b/packet/constant.go index c8de8007..65101dc1 100644 --- a/packet/constant.go +++ b/packet/constant.go @@ -125,9 +125,9 @@ var TCPFlagValueMap = map[string]TCPFlag{ func (f TCPFlag) String() string { ss := make([]string, 0, 6) - for k, v := range TCPFlagNameMap { - if f&k > 0 { - ss = append(ss, v) + for _, v := range []TCPFlag{TCP_FLAG_FIN, TCP_FLAG_SYN, TCP_FLAG_RST, TCP_FLAG_PUSH, TCP_FLAG_ACK, TCP_FLAG_URGENT} { + if f&v > 0 { + ss = append(ss, TCPFlagNameMap[v]) } } return strings.Join(ss, "|") |