projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Use gai_strerror() where appropriate
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
2ad30fc
..
039082e
100644
(file)
--- a/
src/netutl.c
+++ b/
src/netutl.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: netutl.c,v 1.12.4.2
4 2002/02/18 16:25:16
guus Exp $
+ $Id: netutl.c,v 1.12.4.2
6 2002/02/20 22:15:32
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-103,7
+103,7
@@
void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
char port[NI_MAXSERV];
int err;
cp
char port[NI_MAXSERV];
int err;
cp
- if((err = getnameinfo(
(struct sockaddr *)sa, sizeof(sockaddr_t
), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV)))
+ if((err = getnameinfo(
&sa->sa, SA_LEN(sa->sa
), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV)))
{
syslog(LOG_ERR, _("Error while translating addresses: %s"), gai_strerror(err));
cp_trace();
{
syslog(LOG_ERR, _("Error while translating addresses: %s"), gai_strerror(err));
cp_trace();
@@
-123,7
+123,7
@@
char *sockaddr2hostname(sockaddr_t *sa)
char port[NI_MAXSERV] = "unknown";
int err;
cp
char port[NI_MAXSERV] = "unknown";
int err;
cp
- if((err = getnameinfo(
(struct sockaddr *)sa, sizeof(sockaddr_t
), address, sizeof(address), port, sizeof(port), hostnames?0:(NI_NUMERICHOST|NI_NUMERICSERV))))
+ if((err = getnameinfo(
&sa->sa, SA_LEN(sa->sa
), address, sizeof(address), port, sizeof(port), hostnames?0:(NI_NUMERICHOST|NI_NUMERICSERV))))
{
syslog(LOG_ERR, _("Error while looking up hostname: %s"), gai_strerror(err));
}
{
syslog(LOG_ERR, _("Error while looking up hostname: %s"), gai_strerror(err));
}
@@
-165,7
+165,7
@@
int maskcmp(char *a, char *b, int masklen, int len)
{
int i, m, result;
cp
{
int i, m, result;
cp
- for(m = masklen, i = 0; m > 8; m -= 8, i++)
+ for(m = masklen, i = 0; m >
=
8; m -= 8, i++)
if((result = a[i] - b[i]))
return result;
if((result = a[i] - b[i]))
return result;
@@
-193,7
+193,7
@@
void maskcpy(char *a, char *b, int masklen, int len)
{
int i, m;
cp
{
int i, m;
cp
- for(m = masklen, i = 0; m > 8; m -= 8, i++)
+ for(m = masklen, i = 0; m >
=
8; m -= 8, i++)
a[i] = b[i];
if(m)
a[i] = b[i];
if(m)