Add Support for BPF_PROG_TYPE_CGROUP_SOCK_ADDR #261
Conversation
👷 Deploy request for aya-rs pending review.Visit the deploys page to approve it
|
| @@ -257,6 +280,7 @@ impl CgroupSkb { | |||
| pub fn from_syn(mut args: Args, item: ItemFn) -> Result<CgroupSkb> { | |||
| let name = pop_arg(&mut args, "name"); | |||
| let expected_attach_type = pop_arg(&mut args, "attach"); | |||
| err_on_unknown_args(&args)?; | |||
There was a problem hiding this comment.
not related to this PR, but I noticed we didn't try and consume any remaining args in a few macros so figured I'd add it while I was here.
aya/src/programs/sock_addr.rs
Outdated
| "sendmsg6" => Ok(SockAddrAttachType::UDPSendMsg6), | ||
| "recvmsg4" => Ok(SockAddrAttachType::UDPRecvMsg4), | ||
| "recvmsg6" => Ok(SockAddrAttachType::UDPRecvMsg6), | ||
| _ => Err(ProgramError::InvalidAttachType { |
There was a problem hiding this comment.
This should use a custom pub(crate) struct InvalidAttachType(String). No need to add a public ProgramError::InvalidAttachType that is used only internally.
There was a problem hiding this comment.
I've moved it to ParseError, which isn't "exactly" what you asked 😆 but is the right place for this error IMHO.
clippy complained that the pub(crate) struct InvalidAttachType would be leaked so wouldn't allow your suggestion.
There was a problem hiding this comment.
I'd make it pub(crate) try_from at the impl CgroupSockAddrAttachType and return a pub(crate) error (without actually implementing TryFrom for CgroupSockAddrAttachType). We are now exposing a public variant for an internally used error, no bueno.
|
@alessandrod I've addressed most of your comments if you'd like to take another look. |
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>
dave-tucker
added
feature
Sample program: https://github.com/dave-tucker/cgroup-sock-test
Closes: #213