projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Fixed typo.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
c7e8b85
..
dce4ae4
100644
(file)
--- a/
src/net.c
+++ b/
src/net.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: net.c,v 1.35.4.
17 2000/06/30 12:41:05
guus Exp $
+ $Id: net.c,v 1.35.4.
20 2000/07/02 13:40:57
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-531,7
+531,8
@@
cp
return -1;
}
return -1;
}
- syslog(LOG_INFO, _("Connected to %s port %hd"),
+ if(debug_lvl > 0)
+ syslog(LOG_INFO, _("Connected to %s port %hd"),
cl->real_hostname, cl->port);
cp
return 0;
cl->real_hostname, cl->port);
cp
return 0;
@@
-544,13
+545,20
@@
cp
an authentication sequence during which
we will do just that.
*/
an authentication sequence during which
we will do just that.
*/
-int setup_outgoing_connection(
ip_t ip
)
+int setup_outgoing_connection(
char *hostname
)
{
conn_list_t *ncn;
{
conn_list_t *ncn;
+ struct hostent *h;
cp
cp
+ if(!(h = gethostbyname(hostname)))
+ {
+ syslog(LOG_ERR, _("Error looking up `%s': %m"), hostname);
+ return -1;
+ }
+
ncn = new_conn_list();
ncn = new_conn_list();
- ncn->real_ip =
ip
;
- ncn->real_hostname = hostlookup(htonl(ip));
+ ncn->real_ip =
ntohl(*((ip_t*)(h->h_addr_list[0])))
;
+ ncn->real_hostname = hostlookup(htonl(
ncn->real_
ip));
if(setup_outgoing_meta_socket(ncn) < 0)
{
if(setup_outgoing_meta_socket(ncn) < 0)
{
@@
-627,7
+635,7
@@
cp
while(cfg)
{
while(cfg)
{
- if(!setup_outgoing_connection(cfg->data.
ip->ip
)) /* function returns 0 when there are no problems */
+ if(!setup_outgoing_connection(cfg->data.
ptr
)) /* function returns 0 when there are no problems */
{
signal(SIGALRM, SIG_IGN);
return;
{
signal(SIGALRM, SIG_IGN);
return;
@@
-670,7
+678,7
@@
cp
while(cfg)
{
while(cfg)
{
- if(!setup_outgoing_connection(cfg->data.
ip->ip
)) /* function returns 0 when there are no problems */
+ if(!setup_outgoing_connection(cfg->data.
ptr
)) /* function returns 0 when there are no problems */
return 0;
cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
}
return 0;
cfg = get_next_config_val(upstreamip, upstreamindex++); /* Or else we try the next ConnectTo line */
}