contrib: tracing: Fix read of pmsg_type in p2p_monitor.py
#32771
+2
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code Coverage & BenchmarksFor details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32771. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. |
janb84
reviewed
Jun 19, 2025
There was a problem hiding this comment.
ut ACK 3473986
This PR fixes bug not displaying msg_type.
bpf_probe_read_user_str(&msg.msg_type, sizeof(msg.msg_type), pmsg_type tries to copy pmsg_type into kernel space but pmsg_type was still NULL (unassigned). This PR changes bpf_usdt_readarg to copy argument 4 to pmsg_type fixing the bug.
Steps taken in this review:
- git blame (history of bug) ✅
- code review ✅
|
Concept ACK It would be good to have the message type with the size of message in |
fanquake
pushed a commit
to fanquake/bitcoin
that referenced
this pull request
Jun 23, 2025
Github-Pull: bitcoin#32771 Rebased-From: 3473986
|
Backported to 29.x in #32589. |
Merged
fanquake
added a commit
that referenced
this pull request
Jun 25, 2025
0922f6b doc: update release notes for 29.x (fanquake) 5697605 contrib: tracing: Correctly read msg type in p2p_monitor.py (David Gumberg) 4c7ed36 test: Fix list index out of range error in feature_bip68_sequence.py (zaidmstrr) 3e23b47 doc: fix transifex 404s (fanquake) 616baf3 doc: taproot became always active in v24.0 (Sjors Provoost) ef6111b depends: capnp 1.2.0 (fanquake) 8246c6a test: wallet, coverage for crash on dup block disconnection during unclean shutdown (Martin Zumsande) a18085a wallet: fix crash on double block disconnection (furszy) 7264459 build: patch cmake min version on freetype (josibake) 27c5330 doc, windows: CompanyName "Bitcoin" => "Bitcoin Core project" (Hodlinator) 1b51d75 depends: fix SHA256SUM command on OpenBSD (use GNU mode output) (Sebastian Falbesoner) aea8a39 doc: make `-DWITH_ZMQ=ON` explicit on `build-unix.md` (Luis Schwab) 23e76ef guix: warn and abort when SOURCE_DATE_EPOCH is set (will) 876a7b2 doc: add missing packages for BSDs (cmake, gmake, curl) to depends/README.md (Sebastian Falbesoner) 78688c8 rpc, doc: update `listdescriptors` RCP help (rkrux) c899334 rpc: Note in fundrawtransaction doc, fee rate is for package (benthecarman) 247ee59 doc: update tor docs to use bitcoind binary from path (ismaelsadeeq) 4a1143b depends: use "mkdir -p" when installing xproto (fanquake) 646fa1d test: fix sync function in rpc_psbt.py (Martin Zumsande) 17b31fc doc: Add missing top-level description to pruneblockchain RPC (nervana21) e34b6fb guix: accomodate migration to codeberg (fanquake) 142153e cmake: Add missed `SSE41_CXXFLAGS` (Hennadii Stepanov) Pull request description: Backports - #31757 - #32333 - #32439 - #32551 (just 800b7cc) - #32568 - #32607 - #32630 - #32678 - #32679 - #32690 (just 8713e80) - #32693 - #32696 - #32708 - #32711 - #32719 - #32760 - #32765 - #32771 - #32776 - #32777 Closes #32625. ACKs for top commit: instagibbs: ACK 0922f6b willcl-ark: ACK 0922f6b Tree-SHA512: 0389e5d85fa897fdbefd37635f6ec822ca5ab48a57c4d40fdd4d1be2465c676f514b0db4d72c962ee15e0090b27ff17701e167d660eaa25f855d06bbb1fe0e6e
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a bug in the contrib tracing script
p2p_monitor.py. currently the script fails to read themsg_typeof inbound and outbound messages, which is useful in the per-peer message view.Screenshot of p2p_monitor.py on master
Screenshot of p2p_monitor.py on this branch