diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-03-19 12:14:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-19 12:14:34 +0100 |
| commit | f00bb9b3653069b38ed20b7040ff8fd1b6fe7691 (patch) | |
| tree | e421f19863cdb196b77bf26c85cb580dce639e8c | |
| parent | 4912dfbfa5ef52eb8a6c7d54bb23e0092dffb4f2 (diff) | |
| parent | a75be3b6814dd39711c157c29405ee6bd83993f5 (diff) | |
| download | vyos-1x-f00bb9b3653069b38ed20b7040ff8fd1b6fe7691.tar.gz vyos-1x-f00bb9b3653069b38ed20b7040ff8fd1b6fe7691.zip | |
Merge pull request #3150 from sever-sever/T6138
T6138: Fix op-mode show conntrack table with flowtable offloads
| -rwxr-xr-x | src/op_mode/conntrack.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/op_mode/conntrack.py b/src/op_mode/conntrack.py index cf8adf795..6ea213bec 100755 --- a/src/op_mode/conntrack.py +++ b/src/op_mode/conntrack.py @@ -112,7 +112,8 @@ def get_formatted_output(dict_data): proto = meta['layer4']['protoname'] if direction == 'independent': conn_id = meta['id'] - timeout = meta['timeout'] + # T6138 flowtable offload conntrack entries without 'timeout' + timeout = meta.get('timeout', 'n/a') orig_src = f'{orig_src}:{orig_sport}' if orig_sport else orig_src orig_dst = f'{orig_dst}:{orig_dport}' if orig_dport else orig_dst reply_src = f'{reply_src}:{reply_sport}' if reply_sport else reply_src |