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

Optimize inaddrcmp (a little) by making it inline

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2800 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
James Golovich
2004-04-28 17:28:35 +00:00
parent ffe885b21f
commit 8ace87616e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acl.c
View File

@@ -150,12 +150,6 @@ int ast_get_ip(struct sockaddr_in *sin, char *value)
return 0; return 0;
} }
int inaddrcmp(struct sockaddr_in *sin1, struct sockaddr_in *sin2)
{
return ((sin1->sin_addr.s_addr != sin2->sin_addr.s_addr )
|| (sin1->sin_port != sin2->sin_port));
}
/* iface is the interface (e.g. eth0); address is the return value */ /* iface is the interface (e.g. eth0); address is the return value */
int ast_lookup_iface(char *iface, struct in_addr *address) { int ast_lookup_iface(char *iface, struct in_addr *address) {
int mysock, res = 0; int mysock, res = 0;

8
include/asterisk/acl.h
View File

@@ -28,10 +28,16 @@ extern void ast_free_ha(struct ast_ha *ha);
extern struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path); extern struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path);
extern int ast_apply_ha(struct ast_ha *ha, struct sockaddr_in *sin); extern int ast_apply_ha(struct ast_ha *ha, struct sockaddr_in *sin);
extern int ast_get_ip(struct sockaddr_in *sin, char *value); extern int ast_get_ip(struct sockaddr_in *sin, char *value);
extern int inaddrcmp(struct sockaddr_in *sin1, struct sockaddr_in *sin2);
extern int ast_ouraddrfor(struct in_addr *them, struct in_addr *us); extern int ast_ouraddrfor(struct in_addr *them, struct in_addr *us);
extern int ast_lookup_iface(char *iface, struct in_addr *address); extern int ast_lookup_iface(char *iface, struct in_addr *address);
//! Compares the source address and port of two sockaddr_in
static inline int inaddrcmp(struct sockaddr_in *sin1, struct sockaddr_in *sin2)
{
return ((sin1->sin_addr.s_addr != sin2->sin_addr.s_addr )
|| (sin1->sin_port != sin2->sin_port));
}
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
} }
#endif #endif