drop the need for OBJ_CAST() when logging netlink objects #421
Conversation
This file contains 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
KanjiMonster
force-pushed
the
jogo_no_objcast
branch
2 times, most recently
from
9c49559
to
a6fe147
Compare
??? hm, yes, there is no variable "link". lol. |
|
This issue already existed before, but was hidden due to the |
|
Pushed fixes for the unearthed issues. |
|
This MR will need to be rebased after #417, as it created a merge conflict locally for me. |
|
Yepp, whichever you merge first the other one will need to be rebased. |
Instead of forcing users to OBJ_CAST() depending on the type, add helpers for the types to automatically OBJ_CAST(). Signed-off-by: Jonas Gorski <[email protected]>
Now that we have helpers for OBJ_CAST()ing rtnl_* structs as needed, we can drop the OBJ_CAST()s and directly pass the netlink structs. Replacement has been done in via %s/<< OBJ_CAST(\(.*\))/<< \1/g with additional manual fixups where needed. Signed-off-by: Jonas Gorski <[email protected]>
When factoring out the disable vlan code into its functions the error
logs weren't updated from link to port_id, but due to the OBJ_CAST()
this was hidden. After dropping the OBJ_CAST(), g++ started complaining,
so fix the error logs to use port_id.
Fixes the following build warnings:
../git/src/netlink/nl_vlan.cc: In member function 'int basebox::nl_vlan::disable_vlan(uint32_t, uint16_t, bool, uint16_t)':
../git/src/netlink/nl_vlan.cc:263:35: warning: the address of 'int link(const char*, const char*)' will never be NULL [-Waddress]
263 | << ") of link " << link;
| ^~~~
../git/src/netlink/nl_vlan.cc:273:19: warning: the address of 'int link(const char*, const char*)' will never be NULL [-Waddress]
273 | << link;
| ^~~~
../git/src/netlink/nl_vlan.cc:288:62: warning: the address of 'int link(const char*, const char*)' will never be NULL [-Waddress]
288 | << " to remove vid=" << vid << " of link " << link;
|
Fixes: 57832c0 ("nl_vlan: factor out enabling/disabling vlan flows/groups")
Signed-off-by: Jonas Gorski <[email protected]>
There is no link variable in this nl_vxlan::create_endpoint(), only
vxlan_link and br_link. This was hidden due to the OBJ_CAST(), but when
the OBJ_CAST() was dropped, g++ started to complain.
Fix this by replacing link with neigh, since neigh is what the text
before the variable says.
Fixes the following warning:
../git/src/netlink/nl_vxlan.cc: In member function 'int basebox::nl_vxlan::create_endpoint(rtnl_link*, rtnl_link*, nl_addr*)':
../git/src/netlink/nl_vxlan.cc:674:45: warning: the address of 'int link(const char*, const char*)' will never be NULL [-Waddress]
674 | << ") to add l2 neigh " << link;
| ^~~~
Fixes: ec04fe2 ("vxlan: add existing neighbors for new endpoint")
Signed-off-by: Jonas Gorski <[email protected]>
KanjiMonster
force-pushed
the
jogo_no_objcast
branch
from
ab7ddc3
to
0539745
Compare
|
Ready for rebase then |
Too slow, already rebased. ;P |
rubensfig
approved these changes
Nov 15, 2023
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.
Provide appropriate
operator<<s for variousrtnl_*structs instead of forcing callers toOBJ_CAST()them, and dropOBJ_CAST()from all users.Motivation and Context
For some netlink structs we have a
operator<<, for others these must be cast tonl_object *viaOBJ_CAST(). This makes this error prone, as one might forget to hast (which then causes just he object's address to be printed, or add aOBJ_CAST()when one isn't needed, which may even cause crashes if the cast object isn't anl_object(e.g.nl_addr).So handle this casting via appropriate
operator<<s, and reduce the possibilities of errors.How Has This Been Tested?
Built and run tested with debugging enabled.