<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16611] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16611">16611</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-02-11 16:16:25 -0600 (Thu, 11 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>make socket connection nonblocking to timeout to dead ip addrs</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsminiupnpcminiwgetc">freeswitch/trunk/libs/miniupnpc/miniwget.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsminiupnpcminiwgetc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/miniupnpc/miniwget.c (16610 => 16611)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/miniupnpc/miniwget.c 2010-02-11 22:15:41 UTC (rev 16610)
+++ freeswitch/trunk/libs/miniupnpc/miniwget.c 2010-02-11 22:16:25 UTC (rev 16611)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include <netdb.h>
</span><span class="cx"> #include <netinet/in.h>
</span><span class="cx"> #include <arpa/inet.h>
</span><ins>+#include <fcntl.h>
</ins><span class="cx"> #define closesocket close
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(__sun) || defined(sun)
</span><span class="lines">@@ -40,9 +41,12 @@
</span><span class="cx"> int * size, char * addr_str, int addr_str_len)
</span><span class="cx"> {
</span><span class="cx"> char buf[2048];
</span><del>- int s;
</del><ins>+ int s, fd_flags;
</ins><span class="cx"> struct sockaddr_in dest;
</span><span class="cx"> struct hostent *hp;
</span><ins>+
+ fd_flags = 0;
+
</ins><span class="cx"> *size = 0;
</span><span class="cx"> hp = gethostbyname(host);
</span><span class="cx"> if(hp==NULL)
</span><span class="lines">@@ -61,13 +65,61 @@
</span><span class="cx"> }
</span><span class="cx"> dest.sin_family = AF_INET;
</span><span class="cx"> dest.sin_port = htons(port);
</span><del>- if(connect(s, (struct sockaddr *)&dest, sizeof(struct sockaddr_in))<0)
</del><ins>+
+
+
</ins><span class="cx"> {
</span><del>- perror("connect");
- closesocket(s);
- return NULL;
</del><ins>+#ifdef WIN32
+ u_long arg = 1;
+ if (ioctlsocket((SOCKET) s, FIONBIO, &arg) == SOCKET_ERROR) {
+ return NULL;
+ }
+
+#else
+ fd_flags = fcntl(s, F_GETFL, 0);
+
+ if (fcntl(s, F_SETFL, fd_flags | O_NONBLOCK)) {
+ return NULL;
+ }
+
+#endif
+
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ connect(s, (struct sockaddr *)&dest, sizeof(struct sockaddr_in));
+
+ {
+ fd_set wfds;
+ struct timeval tv = { 2, 0 };
+ int r;
+
+ FD_ZERO(&wfds);
+ FD_SET(s, &wfds);
+
+ r = select(s + 1, NULL, &wfds, NULL, &tv);
+
+ if (r <= 0) {
+ return NULL;
+ }
+
+ if (!FD_ISSET(s, &wfds)) {
+ return NULL;
+ }
+
+ }
+
+#ifdef WIN32
+ {
+ u_long arg = 0;
+ if (ioctlsocket((SOCKET) s, FIONBIO, &arg) == SOCKET_ERROR) {
+ return NULL;
+ }
+ }
+#else
+ fcntl(s, F_SETFL, fd_flags);
+#endif
+
+
</ins><span class="cx"> /* get address for caller ! */
</span><span class="cx"> if(addr_str)
</span><span class="cx"> {
</span><span class="lines">@@ -201,8 +253,9 @@
</span><span class="cx"> /* protocol://host:port/chemin */
</span><span class="cx"> char hostname[MAXHOSTNAMELEN+1];
</span><span class="cx"> *size = 0;
</span><del>- if(!parseURL(url, hostname, &port, &path))
</del><ins>+ if(!parseURL(url, hostname, &port, &path)) {
</ins><span class="cx"> return NULL;
</span><ins>+ }
</ins><span class="cx"> return miniwget2(url, hostname, port, path, size, 0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>