Typing helper #342
Typing helper #342
Conversation
bumble/helpers.py
Outdated
| self.analyzer.emit( | ||
| f'{color("L2CAP", "green")} [CID={l2cap_pdu.cid}, ' | ||
| f'PSM={psm_string}]: {l2cap_pdu.payload.hex()}' | ||
| f'PSM={PSM(psm).name}]: {l2cap_pdu.payload.hex()}' |
There was a problem hiding this comment.
This will fail is the PSM isn't in the map.
The solution here (as well as other places where enums can take on values that aren't fully predictable) is to use this class 43b4d66#diff-6a386c4bf931822c523c3b1559afb51d9a35ce754a5519b770ce3e8606b5d9b4R459
Since that class is part of a PR that's not merged yet, maye we can move its definition to this PR instead so that we can start using it (I would deal with the merge conflict in the other PR)
|
This PR is not hurry. Reset to draft unless someone needs it. |
bumble/helpers.py
Outdated
| self.analyzer.emit( | ||
| f'{color("L2CAP", "green")} [CID={l2cap_pdu.cid}, ' | ||
| f'PSM={psm_string}]: {l2cap_pdu.payload.hex()}' | ||
| f'PSM={PSM_NAMES.get(psm)}]: {l2cap_pdu.payload.hex()}' |
There was a problem hiding this comment.
This won't raise, but it still doesn't do what you need when encountering a PSM that's not in the name map. In the original code, the function name_or_number returns either a name, if found in the map, or a string with the hex number representation of the value. We need to keep support for PSM values not in the map here.
No description provided.