Skip to content

Commit 9b31ee5

Browse files
polybassaNils Weiss
authored andcommitted
Potential fix for pull request finding
AI-Assisted: yes (GitHub Copilot)
1 parent 07c8fff commit 9b31ee5

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

scapy/packet.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,16 +1177,20 @@ def guess_payload_class(self, payload):
11771177
fields = self.fields
11781178
overloaded = self.overloaded_fields
11791179
default = self.default_fields
1180+
deprecated_fields = self.deprecated_fields
11801181
matched = True
11811182
for k, v in fval.items():
1182-
# Inline getfieldval for speed: avoid method call
1183-
# and deprecated_fields check per iteration
1184-
if k in fields:
1185-
fv = fields[k]
1186-
elif k in overloaded:
1187-
fv = overloaded[k]
1183+
if deprecated_fields:
1184+
fv = self.getfieldval(k)
11881185
else:
1189-
fv = default[k]
1186+
# Inline getfieldval for speed when there are no
1187+
# deprecated field aliases to resolve.
1188+
if k in fields:
1189+
fv = fields[k]
1190+
elif k in overloaded:
1191+
fv = overloaded[k]
1192+
else:
1193+
fv = default[k]
11901194
if v != fv:
11911195
matched = False
11921196
break

0 commit comments

Comments
 (0)