kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

netsock2: compile fixes.

Browse Source 
This fixes ast_addressfamily_to_sockaddrsize to reference the
provided argument, and ast_sockaddr_from_sockaddr to not use the name of
a structure as argument.

Change-Id: Ibf5db469c47c3b4214edf8456326086174e8edd7
This commit is contained in:
Jaco Kroon
2020-03-20 16:12:05 +02:00
committed by Joshua Colp
parent 96efd52460
commit 6b2aea9ce2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/asterisk/netsock2.h
View File

@@ -754,7 +754,7 @@ void _ast_sockaddr_from_sin(struct ast_sockaddr *addr, const struct sockaddr_in
* \param family The AF_XXX value to determine the size of * \param family The AF_XXX value to determine the size of
* \return Size of the applicable struct sockaddr. * \return Size of the applicable struct sockaddr.
*/ */
#define ast_addressfamily_to_sockaddrsize(family) _ast_addressfamily_to_sockaddrsize(addr, __FILE__, __LINE__, __PRETTY_FUNCTION__) #define ast_addressfamily_to_sockaddrsize(family) _ast_addressfamily_to_sockaddrsize(family, __FILE__, __LINE__, __PRETTY_FUNCTION__)
static inline int _ast_addressfamily_to_sockaddrsize(int af, const char *file, int line, const char *func) static inline int _ast_addressfamily_to_sockaddrsize(int af, const char *file, int line, const char *func)
{ {
switch (af) { switch (af) {
@@ -780,10 +780,10 @@ static inline int _ast_addressfamily_to_sockaddrsize(int af, const char *file, i
* You can check for failure with ast_sockaddr_isnull. * You can check for failure with ast_sockaddr_isnull.
* *
* \param[out] addr The address of the ast_sockaddr to store into * \param[out] addr The address of the ast_sockaddr to store into
* \param sockaddr The sockaddr structure (sockaddr_in or sockaddr_in6) to convert * \param sa The sockaddr structure (sockaddr_in or sockaddr_in6) to convert
* \return Nothing * \return Nothing
*/ */
#define ast_sockaddr_from_sockaddr(addr,sockaddr) ast_sockaddr_copy_sockaddr(addr, sockaddr, ast_addressfamily_to_sockaddrsize(((const struct sockaddr*)(sockaddr))->sa_family)) #define ast_sockaddr_from_sockaddr(addr,sa) ast_sockaddr_copy_sockaddr(addr, sa, ast_addressfamily_to_sockaddrsize(((const struct sockaddr*)(sa))->sa_family))
/*@}*/ /*@}*/