From cfc8ce9ad19dd5455fc0bb56633114798b85913a Mon Sep 17 00:00:00 2001
From: AmyangXYZ <amyang.xyz@gmail.com>
Date: Sun, 4 Feb 2024 17:16:12 -0500
Subject: [PATCH] fix pkt filter

---
 src/components/PacketSniffer.vue   | 10 +++++++---
 src/components/TopoEditToolbox.vue | 12 ++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/components/PacketSniffer.vue b/src/components/PacketSniffer.vue
index b49b6eb..fcd5ea6 100644
--- a/src/components/PacketSniffer.vue
+++ b/src/components/PacketSniffer.vue
@@ -7,9 +7,13 @@ import { Filter } from '@element-plus/icons-vue'
 
 const filterRules = ref()
 
-function filterFunc(pkt: Packet) {
+function filterFunc(pkt: Packet): boolean {
   if (filterRules.value == undefined) return true
-  return eval(filterRules.value)
+  try {
+    return eval(filterRules.value)
+  } catch (error) {
+    return pkt != undefined
+  }
 }
 
 const columns: any = [
@@ -111,7 +115,7 @@ Row.inheritAttrs = false
         <el-input
           v-model="filterRules"
           class="filter-input"
-          placeholder="pkt.src == 1 && pkt.type != ACK"
+          placeholder="pkt.mac_src == 1 && pkt.type != ACK"
           :suffix-icon="Filter"
         />
       </div>
diff --git a/src/components/TopoEditToolbox.vue b/src/components/TopoEditToolbox.vue
index 60764d4..9e147fe 100644
--- a/src/components/TopoEditToolbox.vue
+++ b/src/components/TopoEditToolbox.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { Network, SignalEditTopology, SignalAddNode, SignalUpdateLinks } from '@/hooks/useStates'
-import { Check, Plus, Switch, Sort, Share, Download } from '@element-plus/icons-vue'
+import { Check, Plus, Switch, Sort, Download } from '@element-plus/icons-vue'
 import { NODE_TYPE } from '@/core/typedefs'
 
 const nodeType = ref(0)
@@ -60,11 +60,11 @@ const exportTopo = () => {
 </script>
 
 <template>
-  <el-card >
-    <el-row :gutter="10" align="middle" >
+  <el-card>
+    <el-row :gutter="10" align="middle">
       <el-col :span="6"> Load: </el-col>
       <el-col :span="18">
-        <el-select  v-model="Network.SelectedTopo.value" style="width: 100%; text-align-last: center">
+        <el-select v-model="Network.SelectedTopo.value" style="width: 100%; text-align-last: center">
           <el-option v-for="(_, name) in Network.PresetTopos" :key="name" :label="name" :value="name" />
         </el-select>
       </el-col>
@@ -87,8 +87,8 @@ const exportTopo = () => {
     <el-row :gutter="10" align="middle" class="row">
       <el-col :span="6"> Connect: </el-col>
       <el-col :span="15">
-        <el-row justify="space-between" >
-          <el-col :span="11" >
+        <el-row justify="space-between">
+          <el-col :span="11">
             <el-input input-style="text-align=center" type="number" min="1" v-model="v1" />
           </el-col>
           <el-col :span="11">