Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove addrlen switch duplication #864

Open
skliper opened this issue Mar 10, 2021 · 0 comments · May be fixed by #1388
Open

Remove addrlen switch duplication #864

skliper opened this issue Mar 10, 2021 · 0 comments · May be fixed by #1388
Labels
CFS-38 enhancement

Comments

@skliper
Copy link
Contributor

skliper commented Mar 10, 2021

Is your feature request related to a problem? Please describe.
Switch to get addrlen repeated multiple times:

osal/src/os/portable/os-impl-bsd-sockets.c

Lines 188 to 201 in ead5723

switch (sa->sa_family)
{
case AF_INET:
addrlen = sizeof(struct sockaddr_in);
break;
#ifdef OS_NETWORK_SUPPORTS_IPV6
case AF_INET6:
addrlen = sizeof(struct sockaddr_in6);
break;
#endif
default:
addrlen = 0;
break;
}

osal/src/os/portable/os-impl-bsd-sockets.c

Lines 248 to 262 in ead5723

sa = (const struct sockaddr *)&Addr->AddrData;
switch (sa->sa_family)
{
case AF_INET:
slen = sizeof(struct sockaddr_in);
break;
#ifdef OS_NETWORK_SUPPORTS_IPV6
case AF_INET6:
slen = sizeof(struct sockaddr_in6);
break;
#endif
default:
slen = 0;
break;
}

osal/src/os/portable/os-impl-bsd-sockets.c

Lines 484 to 498 in ead5723

sa = (const struct sockaddr *)&RemoteAddr->AddrData;
switch (sa->sa_family)
{
case AF_INET:
addrlen = sizeof(struct sockaddr_in);
break;
#ifdef OS_NETWORK_SUPPORTS_IPV6
case AF_INET6:
addrlen = sizeof(struct sockaddr_in6);
break;
#endif
default:
addrlen = 0;
break;
}

osal/src/os/portable/os-impl-bsd-sockets.c

Lines 545 to 561 in ead5723

switch (Domain)
{
case OS_SocketDomain_INET:
sa_family = AF_INET;
addrlen = sizeof(struct sockaddr_in);
break;
#ifdef OS_NETWORK_SUPPORTS_IPV6
case OS_SocketDomain_INET6:
sa_family = AF_INET6;
addrlen = sizeof(struct sockaddr_in6);
break;
#endif
default:
sa_family = 0;
addrlen = 0;
break;
}

Describe the solution you'd like
Calculate once and store or implement once and inline

Describe alternatives you've considered
Leave as-is (future work)

Additional context
None

Requester Info
Jacob Hageman - NASA/GSFC, OSAL code review
jphickey pushed a commit to jphickey/osal that referenced this issue Aug 10, 2022
@yammajamma
Merge pull request nasa#864 from skliper/fix863-debugmsg-events
5c296a8 
Fix nasa#863, Add debug message from SendEvents
thnkslprpt added a commit to thnkslprpt/osal that referenced this issue May 10, 2023
@thnkslprpt
Fix nasa#864, Refactor duplicate addrlen swtiches into an inline fu…
aa8459d 
…nction
@thnkslprpt thnkslprpt linked a pull request May 10, 2023 that will close this issue
Open
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
CFS-38 enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Fix #864, Refactor duplicate addrlen swtiches into an inline function thnkslprpt/osal
1 participant
@skliper