Comparison

core/s2smanager.lua @ 3312:12fc7e005e8b

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 02 Jul 2010 17:44:14 +0100
parent 3308:f5243ca9662f
parent 3309:1c58cb93ef3e
child 3329:9adafeeadecb
comparison
equal deleted inserted replaced
3308:f5243ca9662f 3312:12fc7e005e8b
206 end 206 end
207 207
208 208
209 function attempt_connection(host_session, err) 209 function attempt_connection(host_session, err)
210 local from_host, to_host = host_session.from_host, host_session.to_host; 210 local from_host, to_host = host_session.from_host, host_session.to_host;
211 local connect_host, connect_port = idna_to_ascii(to_host), 5269; 211 local connect_host, connect_port = to_host and idna_to_ascii(to_host), 5269;
212 212
213 if not connect_host then 213 if not connect_host then
214 return false; 214 return false;
215 end 215 end
216 216