Skip to content

TRQ-4072. Add bind() before client-side connect() calls#435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acvizi merged 1 commit into from
Sep 18, 2017
Merged

TRQ-4072. Add bind() before client-side connect() calls #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1858,6 +1858,18 @@ esac



dnl Make a bind() call before making a connect() call
AC_MSG_CHECKING([whether to build with bind() calls before connect() calls])
AC_ARG_ENABLE(bind-outbound-sockets,
[ --enable-bind-outbound-sockets enable build with bind() calls before connect() calls],
BIND_OUTBOUND_SOCKETS=$enableval,BIND_OUTBOUND_SOCKETS=yes)
AC_MSG_RESULT($BIND_OUTBOUND_SOCKETS)
if test "$BIND_OUTBOUND_SOCKETS" = "yes" ; then
AC_DEFINE(BIND_OUTBOUND_SOCKETS, 1, [turns on the compilation of BIND_OUTBOUND_SOCKETS code])
fi



dnl
dnl ######################################################################
dnl Scheduler settings
Expand Down
26 changes: 26 additions & 0 deletions src/lib/Libifl/tm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -484,6 +484,11 @@ static int localmom(void)

struct linger ltime;

#ifdef BIND_OUTBOUND_SOCKETS
struct sockaddr_in local;
#endif


if (local_conn >= 0)
{
return(local_conn); /* already have open connection */
Expand DownExpand Up@@ -528,6 +533,27 @@ static int localmom(void)

#endif

#ifdef BIND_OUTBOUND_SOCKETS

/* Bind to the IP address associated with the hostname, in case there are
* muliple possible source IPs for this destination.*/

if (get_local_address(local) != 0)
{
TM_DBPRT(("tm_init: unable to determine local IP address"));
close(sock);
return(-1);
}

if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)) != 0)
{
TM_DBPRT(("tm_init: unable to bind to local IP address"));
close(sock);
return(-1);
}
#endif


/* make sure data goes out */

ltime.l_onoff = 1;
Expand Down
26 changes: 26 additions & 0 deletions src/lib/Libifl/trq_auth.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -331,6 +331,19 @@ int trq_simple_connect(
int optval = 1;
std::string server(server_name);

#ifdef BIND_OUTBOUND_SOCKETS
struct sockaddr_in local;

/* Bind to the IP address associated with the hostname, in case there are
* muliple possible source IPs for this destination.*/
if (get_local_address(local) != PBSE_NONE)
{
fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
return(PBSE_SYSTEM);
}

#endif

memset(&hints, 0, sizeof(hints));
/* set the hints so we get a STREAM socket */
hints.ai_family = AF_UNSPEC; /* allow for IPv4 or IPv6 */
Expand DownExpand Up@@ -365,6 +378,19 @@ int trq_simple_connect(
continue;
}

#ifdef BIND_OUTBOUND_SOCKETS

rc = bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in));
if (rc != 0)
{
fprintf(stderr, "could not bind local socket: %s", strerror(errno));
rc = PBSE_SYSTEM;
close(sock);
continue;
}

#endif

rc = connect(sock, addr_info->ai_addr, addr_info->ai_addrlen);
if (rc != 0)
{
Expand Down
1 change: 1 addition & 0 deletions src/lib/Libnet/lib_net.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ int socket_read_str(int socket, char **the_str, long long *str_len);
int socket_close(int socket);
int pbs_getaddrinfo(const char *pNode,struct addrinfo *pHints,struct addrinfo **ppAddrInfoOut);
int connect_to_trqauthd(int *sock);
int get_local_address(struct sockaddr_in &new_sockaddr);


/* from file server_core.c */
Expand Down
64 changes: 59 additions & 5 deletions src/lib/Libnet/net_common.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -205,13 +205,22 @@ int socket_get_tcp_priv()
int priv_port = 0;
int flags;
#endif

memset(&local, 0, sizeof(struct sockaddr_in));
local.sin_family = AF_INET;


if ((local_socket = socket_get_tcp()) < 0)
return(-1);

#ifdef BIND_OUTBOUND_SOCKETS
if (get_local_address(local) != PBSE_NONE)
{
close(local_socket);
return(-1);
}
#else
memset(&local, 0, sizeof(struct sockaddr_in));
local.sin_family = AF_INET;
#endif


#ifndef NOPRIVPORTS
/* According to the notes in the previous code:
* bindresvport seems to cause connect() failures in some odd corner case
Expand DownExpand Up@@ -1030,4 +1039,49 @@ int connect_to_trqauthd(
return(rc);
}



/*
* get_local_address() - lookup the local IP address associated with the local,
* public hostname.
*
* This function will cache the IP address in each process to speed up
* frequent lookups.
*/
int get_local_address(

struct sockaddr_in &new_sockaddr)

{
static struct addrinfo *local_addr_info = NULL;
struct addrinfo hints;
int rc;
char hostname[PBS_MAXHOSTNAME];
hostname[PBS_MAXHOSTNAME - 1] = '\0';

// If we already have the local address cached, return (copy) that value.
if (local_addr_info != NULL)
{
new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

return PBSE_NONE;
}

/* Bind to the IP address associated with the hostname, in case there are
* muliple possible source IPs for this destination.*/
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_STREAM;

gethostname(hostname, sizeof(hostname));

rc = getaddrinfo(hostname, NULL, &hints, &local_addr_info);
if (rc != 0)
{
return(rc);
}

new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

return PBSE_NONE;
}

25 changes: 25 additions & 0 deletions src/lib/Libnet/port_forwarding.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <poll.h>
#include "lib_ifl.h"
#include "lib_net.h"


#include "port_forwarding.h"
Expand DownExpand Up@@ -335,6 +336,9 @@ int x11_connect_display(
char buf[1024], *cp;

struct addrinfo hints, *ai, *aitop;
#ifdef BIND_OUTBOUND_SOCKETS
struct sockaddr_in local;
#endif

char strport[NI_MAXSERV];

Expand DownExpand Up@@ -413,6 +417,14 @@ int x11_connect_display(
return -1;
}

#ifdef BIND_OUTBOUND_SOCKETS
if (get_local_address(local) != PBSE_NONE)
{
fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
return(-1);
}
#endif

for (ai = aitop; ai; ai = ai->ai_next)
{
/* Create a socket. */
Expand All@@ -424,6 +436,19 @@ int x11_connect_display(
continue;
}

#ifdef BIND_OUTBOUND_SOCKETS
/* Bind to the IP address associated with the hostname, in case there are
* muliple possible source IPs for this destination.*/

if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)))
{
fprintf(stderr, "could not bind local socket: %s", strerror(errno));
close(sock);
continue;
}

#endif

/* Connect it to the display. */
if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0)
{
Expand Down
27 changes: 23 additions & 4 deletions src/lib/Libnet/rm.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,7 @@ int openrm(

struct sockaddr_in addr;
struct addrinfo *addr_info;
struct sockaddr_in local;

if (pbs_getaddrinfo(host, NULL, &addr_info) != 0)
{
Expand All@@ -216,18 +217,36 @@ int openrm(
return(ENOENT * -1);
}

memset(&addr, '\0', sizeof(addr));
#ifdef BIND_OUTBOUND_SOCKETS
/* Bind to the IP address associated with the hostname, in case there are
* muliple possible source IPs for this destination.*/
if (get_local_address(local) != PBSE_NONE)
{
DBPRT(("could not determine local IP address: %s", strerror(errno)));
close(stream);
return(-1);
}

addr.sin_family = AF_INET;
addr.sin_addr.s_addr = htonl(INADDR_ANY);
#else

memset(&local, 0, sizeof(struct sockaddr_in));

local.sin_family = AF_INET;

#endif

while (retries++ < MAX_RETRIES)
{
rc = bindresvport(stream, &addr);
/* Attempt to bind to any reserved port that is free. If BIND_OUTBOUND_SOCKETS
* is defined, we need to make sure the socket is bound to a specific
* local IP address - passed in using the `local` structure.
*/
rc = bindresvport(stream, &local);
if (rc != 0)
{
if (retries >= MAX_RETRIES)
{
DBPRT(("could not bind local socket: %s", strerror(errno)));
close(stream);
return(-1*errno);
}
Expand Down
31 changes: 31 additions & 0 deletions src/resmom/start_exec.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,9 @@ extern "C"
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#if IBM_SP2==2 /* IBM SP with PSSP 3.1 */
#include <st_client.h>
#endif /* IBM SP */
Expand DownExpand Up@@ -804,6 +807,10 @@ int open_demux(
torque_socklen_t slen;
unsigned short local_port;

#ifdef BIND_OUTBOUND_SOCKETS
struct sockaddr_in local;
#endif

memset(&remote, 0, sizeof(remote));
remote.sin_addr.s_addr = addr;
remote.sin_port = htons((unsigned short)port);
Expand All@@ -820,6 +827,30 @@ int open_demux(
return(-1);
}

#ifdef BIND_OUTBOUND_SOCKETS
/* Bind to the IP address associated with the hostname, in case there are
* muliple possible source IPs for this destination.*/

if (get_local_address(local) != PBSE_NONE)
{
sprintf(log_buffer, "could not determine local IP address: %s", strerror(errno));
log_err(errno, __func__, log_buffer);

close(sock);
return(-1);
}

if (bind(sock, (struct sockaddr *)&local, sizeof(local)))
{
sprintf(log_buffer, "could not bind local socket: %s", strerror(errno));
log_err(errno, __func__, log_buffer);

close(sock);
return(-1);
}

#endif

for (i = 0;i < RETRY;i++)
{
if (connect(sock, (struct sockaddr *)&remote, sizeof(remote)) == 0)
Expand Down
26 changes: 26 additions & 0 deletions src/test/net_common/test_uut.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
#include <stdio.h>
#include <errno.h>
#include <poll.h>
#include <sys/socket.h>
#include <netdb.h>
#include <unistd.h>

#include "pbs_error.h"
#include "net_cache.h"
Expand DownExpand Up@@ -144,6 +147,25 @@ START_TEST(test_socket_wait_for_write)
}
END_TEST

START_TEST(test_get_local_address)
{
int rc;
struct sockaddr_in new_sockaddr;
char hostname[NI_MAXHOST];
char hbuf[NI_MAXHOST];

gethostname(hostname, sizeof(hostname));

rc = get_local_address(new_sockaddr);
fail_unless(rc == PBSE_NONE);

rc = getnameinfo((struct sockaddr*)&new_sockaddr, sizeof(new_sockaddr), hbuf, sizeof(hbuf), NULL, 0, 0);

fail_unless(rc == 0);
fail_unless(strncmp(hostname, hbuf, NI_MAXHOST) == 0);
}
END_TEST

Suite *net_common_suite(void)
{
Suite *s = suite_create("net_common_suite methods");
Expand DownExpand Up@@ -171,6 +193,10 @@ Suite *net_common_suite(void)
tcase_add_test(tc_core, test_socket_wait_for_write);
suite_add_tcase(s, tc_core);

tc_core = tcase_create("test_get_local_address");
tcase_add_test(tc_core, test_get_local_address);
suite_add_tcase(s, tc_core);

return s;
}

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
TRQ-4072. Add bind() before client-side connect() calls by DanielSaunders · Pull Request #435 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4072. Add bind() before client-side connect() calls#435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4072. Add bind() before client-side connect() calls
#435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
configure.ac

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1858,6 +1858,18 @@ esac



dnl Make a bind() call before making a connect() call
AC_MSG_CHECKING([whether to build with bind() calls before connect() calls])
AC_ARG_ENABLE(bind-outbound-sockets,
 [ --enable-bind-outbound-sockets enable build with bind() calls before connect() calls],
 BIND_OUTBOUND_SOCKETS=$enableval,BIND_OUTBOUND_SOCKETS=yes)
AC_MSG_RESULT($BIND_OUTBOUND_SOCKETS)
if test "$BIND_OUTBOUND_SOCKETS" = "yes" ; then
	AC_DEFINE(BIND_OUTBOUND_SOCKETS, 1, [turns on the compilation of BIND_OUTBOUND_SOCKETS code])
fi



dnl
dnl ######################################################################
dnl Scheduler settings
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/tm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,6 +484,11 @@ static int localmom(void)

 struct linger ltime;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif


 if (local_conn >= 0)
 {
 return(local_conn); /* already have open connection */
Expand DownExpand Up@@ -528,6 +533,27 @@ static int localmom(void)

#endif

#ifdef BIND_OUTBOUND_SOCKETS

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != 0)
 {
 TM_DBPRT(("tm_init: unable to determine local IP address"));
 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)) != 0)
 {
 TM_DBPRT(("tm_init: unable to bind to local IP address"));
 close(sock);
 return(-1);
 }
#endif


 /* make sure data goes out */

 ltime.l_onoff = 1;
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/trq_auth.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -331,6 +331,19 @@ int trq_simple_connect(
 int optval = 1;
 std::string server(server_name);

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(PBSE_SYSTEM);
 }

#endif

 memset(&hints, 0, sizeof(hints));
 /* set the hints so we get a STREAM socket */
 hints.ai_family = AF_UNSPEC; /* allow for IPv4 or IPv6 */
Expand DownExpand Up@@ -365,6 +378,19 @@ int trq_simple_connect(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS

 rc = bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in));
 if (rc != 0)
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 rc = PBSE_SYSTEM;
 close(sock);
 continue;
 }

#endif

 rc = connect(sock, addr_info->ai_addr, addr_info->ai_addrlen);
 if (rc != 0)
 {
Expand Down

1 change: 1 addition & 0 deletions
src/lib/Libnet/lib_net.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ int socket_read_str(int socket, char **the_str, long long *str_len);
int socket_close(int socket);
int pbs_getaddrinfo(const char *pNode,struct addrinfo *pHints,struct addrinfo **ppAddrInfoOut);
int connect_to_trqauthd(int *sock);
int get_local_address(struct sockaddr_in &new_sockaddr);


/* from file server_core.c */
Expand Down

64 changes: 59 additions & 5 deletions
src/lib/Libnet/net_common.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,13 +205,22 @@ int socket_get_tcp_priv()
 int priv_port = 0;
 int flags;
#endif

 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;


 if ((local_socket = socket_get_tcp()) < 0)
 return(-1);

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 close(local_socket);
 return(-1);
 }
#else
 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;
#endif


#ifndef NOPRIVPORTS
 /* According to the notes in the previous code:
 * bindresvport seems to cause connect() failures in some odd corner case
Expand DownExpand Up@@ -1030,4 +1039,49 @@ int connect_to_trqauthd(
 return(rc);
 }



/*
 * get_local_address() - lookup the local IP address associated with the local,
 * public hostname.
 *
 * This function will cache the IP address in each process to speed up
 * frequent lookups.
 */
int get_local_address(

 struct sockaddr_in &new_sockaddr)

 {
 static struct addrinfo *local_addr_info = NULL;
 struct addrinfo hints;
 int rc;
 char hostname[PBS_MAXHOSTNAME];
 hostname[PBS_MAXHOSTNAME - 1] = '\0';

 // If we already have the local address cached, return (copy) that value.
 if (local_addr_info != NULL)
 {
 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 memset(&hints, 0, sizeof(hints));
 hints.ai_family = AF_INET;
 hints.ai_socktype = SOCK_STREAM;

 gethostname(hostname, sizeof(hostname));

 rc = getaddrinfo(hostname, NULL, &hints, &local_addr_info);
 if (rc != 0)
 {
 return(rc);
 }

 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }


25 changes: 25 additions & 0 deletions
src/lib/Libnet/port_forwarding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <poll.h>
#include "lib_ifl.h"
#include "lib_net.h"


#include "port_forwarding.h"
Expand DownExpand Up@@ -335,6 +336,9 @@ int x11_connect_display(
 char buf[1024], *cp;

 struct addrinfo hints, *ai, *aitop;
#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 char strport[NI_MAXSERV];

Expand DownExpand Up@@ -413,6 +417,14 @@ int x11_connect_display(
 return -1;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(-1);
 }
#endif

 for (ai = aitop; ai; ai = ai->ai_next)
 {
 /* Create a socket. */
Expand All@@ -424,6 +436,19 @@ int x11_connect_display(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)))
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 close(sock);
 continue;
 }

#endif

 /* Connect it to the display. */
 if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0)
 {
Expand Down

27 changes: 23 additions & 4 deletions
src/lib/Libnet/rm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,7 @@ int openrm(

 struct sockaddr_in addr;
 struct addrinfo *addr_info;
 struct sockaddr_in local;

 if (pbs_getaddrinfo(host, NULL, &addr_info) != 0)
 {
Expand All@@ -216,18 +217,36 @@ int openrm(
 return(ENOENT * -1);
 }

 memset(&addr, '\0', sizeof(addr));
#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 DBPRT(("could not determine local IP address: %s", strerror(errno)));
 close(stream);
 return(-1);
 }

 addr.sin_family = AF_INET;
 addr.sin_addr.s_addr = htonl(INADDR_ANY);
#else

 memset(&local, 0, sizeof(struct sockaddr_in));

 local.sin_family = AF_INET;

#endif

 while (retries++ < MAX_RETRIES)
 {
 rc = bindresvport(stream, &addr);
 /* Attempt to bind to any reserved port that is free. If BIND_OUTBOUND_SOCKETS
 * is defined, we need to make sure the socket is bound to a specific
 * local IP address - passed in using the `local` structure.
 */
 rc = bindresvport(stream, &local);
 if (rc != 0)
 {
 if (retries >= MAX_RETRIES)
 {
 DBPRT(("could not bind local socket: %s", strerror(errno)));
 close(stream);
 return(-1*errno);
 }
Expand Down

31 changes: 31 additions & 0 deletions
src/resmom/start_exec.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,9 @@ extern "C"
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#if IBM_SP2==2 /* IBM SP with PSSP 3.1 */
 #include <st_client.h>
#endif /* IBM SP */
Expand DownExpand Up@@ -804,6 +807,10 @@ int open_demux(
 torque_socklen_t slen;
 unsigned short local_port;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 memset(&remote, 0, sizeof(remote));
 remote.sin_addr.s_addr = addr;
 remote.sin_port = htons((unsigned short)port);
Expand All@@ -820,6 +827,30 @@ int open_demux(
 return(-1);
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != PBSE_NONE)
 {
 sprintf(log_buffer, "could not determine local IP address: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(local)))
 {
 sprintf(log_buffer, "could not bind local socket: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

#endif

 for (i = 0;i < RETRY;i++)
 {
 if (connect(sock, (struct sockaddr *)&remote, sizeof(remote)) == 0)
Expand Down

26 changes: 26 additions & 0 deletions
src/test/net_common/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
#include <stdio.h>
#include <errno.h>
#include <poll.h>
#include <sys/socket.h>
#include <netdb.h>
#include <unistd.h>

#include "pbs_error.h"
#include "net_cache.h"
Expand DownExpand Up@@ -144,6 +147,25 @@ START_TEST(test_socket_wait_for_write)
 }
END_TEST

START_TEST(test_get_local_address)
 {
 int rc;
 struct sockaddr_in new_sockaddr;
 char hostname[NI_MAXHOST];
 char hbuf[NI_MAXHOST];

 gethostname(hostname, sizeof(hostname));

 rc = get_local_address(new_sockaddr);
 fail_unless(rc == PBSE_NONE);

 rc = getnameinfo((struct sockaddr*)&new_sockaddr, sizeof(new_sockaddr), hbuf, sizeof(hbuf), NULL, 0, 0);

 fail_unless(rc == 0);
 fail_unless(strncmp(hostname, hbuf, NI_MAXHOST) == 0);
 }
END_TEST

Suite *net_common_suite(void)
 {
 Suite *s = suite_create("net_common_suite methods");
Expand DownExpand Up@@ -171,6 +193,10 @@ Suite *net_common_suite(void)
 tcase_add_test(tc_core, test_socket_wait_for_write);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_get_local_address");
 tcase_add_test(tc_core, test_get_local_address);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
TRQ-4072. Add bind() before client-side connect() calls by DanielSaunders · Pull Request #435 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4072. Add bind() before client-side connect() calls#435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4072. Add bind() before client-side connect() calls
#435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
configure.ac

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1858,6 +1858,18 @@ esac



dnl Make a bind() call before making a connect() call
AC_MSG_CHECKING([whether to build with bind() calls before connect() calls])
AC_ARG_ENABLE(bind-outbound-sockets,
 [ --enable-bind-outbound-sockets enable build with bind() calls before connect() calls],
 BIND_OUTBOUND_SOCKETS=$enableval,BIND_OUTBOUND_SOCKETS=yes)
AC_MSG_RESULT($BIND_OUTBOUND_SOCKETS)
if test "$BIND_OUTBOUND_SOCKETS" = "yes" ; then
	AC_DEFINE(BIND_OUTBOUND_SOCKETS, 1, [turns on the compilation of BIND_OUTBOUND_SOCKETS code])
fi



dnl
dnl ######################################################################
dnl Scheduler settings
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/tm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,6 +484,11 @@ static int localmom(void)

 struct linger ltime;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif


 if (local_conn >= 0)
 {
 return(local_conn); /* already have open connection */
Expand DownExpand Up@@ -528,6 +533,27 @@ static int localmom(void)

#endif

#ifdef BIND_OUTBOUND_SOCKETS

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != 0)
 {
 TM_DBPRT(("tm_init: unable to determine local IP address"));
 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)) != 0)
 {
 TM_DBPRT(("tm_init: unable to bind to local IP address"));
 close(sock);
 return(-1);
 }
#endif


 /* make sure data goes out */

 ltime.l_onoff = 1;
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/trq_auth.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -331,6 +331,19 @@ int trq_simple_connect(
 int optval = 1;
 std::string server(server_name);

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(PBSE_SYSTEM);
 }

#endif

 memset(&hints, 0, sizeof(hints));
 /* set the hints so we get a STREAM socket */
 hints.ai_family = AF_UNSPEC; /* allow for IPv4 or IPv6 */
Expand DownExpand Up@@ -365,6 +378,19 @@ int trq_simple_connect(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS

 rc = bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in));
 if (rc != 0)
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 rc = PBSE_SYSTEM;
 close(sock);
 continue;
 }

#endif

 rc = connect(sock, addr_info->ai_addr, addr_info->ai_addrlen);
 if (rc != 0)
 {
Expand Down

1 change: 1 addition & 0 deletions
src/lib/Libnet/lib_net.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ int socket_read_str(int socket, char **the_str, long long *str_len);
int socket_close(int socket);
int pbs_getaddrinfo(const char *pNode,struct addrinfo *pHints,struct addrinfo **ppAddrInfoOut);
int connect_to_trqauthd(int *sock);
int get_local_address(struct sockaddr_in &new_sockaddr);


/* from file server_core.c */
Expand Down

64 changes: 59 additions & 5 deletions
src/lib/Libnet/net_common.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,13 +205,22 @@ int socket_get_tcp_priv()
 int priv_port = 0;
 int flags;
#endif

 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;


 if ((local_socket = socket_get_tcp()) < 0)
 return(-1);

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 close(local_socket);
 return(-1);
 }
#else
 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;
#endif


#ifndef NOPRIVPORTS
 /* According to the notes in the previous code:
 * bindresvport seems to cause connect() failures in some odd corner case
Expand DownExpand Up@@ -1030,4 +1039,49 @@ int connect_to_trqauthd(
 return(rc);
 }



/*
 * get_local_address() - lookup the local IP address associated with the local,
 * public hostname.
 *
 * This function will cache the IP address in each process to speed up
 * frequent lookups.
 */
int get_local_address(

 struct sockaddr_in &new_sockaddr)

 {
 static struct addrinfo *local_addr_info = NULL;
 struct addrinfo hints;
 int rc;
 char hostname[PBS_MAXHOSTNAME];
 hostname[PBS_MAXHOSTNAME - 1] = '\0';

 // If we already have the local address cached, return (copy) that value.
 if (local_addr_info != NULL)
 {
 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 memset(&hints, 0, sizeof(hints));
 hints.ai_family = AF_INET;
 hints.ai_socktype = SOCK_STREAM;

 gethostname(hostname, sizeof(hostname));

 rc = getaddrinfo(hostname, NULL, &hints, &local_addr_info);
 if (rc != 0)
 {
 return(rc);
 }

 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }


25 changes: 25 additions & 0 deletions
src/lib/Libnet/port_forwarding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <poll.h>
#include "lib_ifl.h"
#include "lib_net.h"


#include "port_forwarding.h"
Expand DownExpand Up@@ -335,6 +336,9 @@ int x11_connect_display(
 char buf[1024], *cp;

 struct addrinfo hints, *ai, *aitop;
#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 char strport[NI_MAXSERV];

Expand DownExpand Up@@ -413,6 +417,14 @@ int x11_connect_display(
 return -1;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(-1);
 }
#endif

 for (ai = aitop; ai; ai = ai->ai_next)
 {
 /* Create a socket. */
Expand All@@ -424,6 +436,19 @@ int x11_connect_display(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)))
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 close(sock);
 continue;
 }

#endif

 /* Connect it to the display. */
 if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0)
 {
Expand Down

27 changes: 23 additions & 4 deletions
src/lib/Libnet/rm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,7 @@ int openrm(

 struct sockaddr_in addr;
 struct addrinfo *addr_info;
 struct sockaddr_in local;

 if (pbs_getaddrinfo(host, NULL, &addr_info) != 0)
 {
Expand All@@ -216,18 +217,36 @@ int openrm(
 return(ENOENT * -1);
 }

 memset(&addr, '\0', sizeof(addr));
#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 DBPRT(("could not determine local IP address: %s", strerror(errno)));
 close(stream);
 return(-1);
 }

 addr.sin_family = AF_INET;
 addr.sin_addr.s_addr = htonl(INADDR_ANY);
#else

 memset(&local, 0, sizeof(struct sockaddr_in));

 local.sin_family = AF_INET;

#endif

 while (retries++ < MAX_RETRIES)
 {
 rc = bindresvport(stream, &addr);
 /* Attempt to bind to any reserved port that is free. If BIND_OUTBOUND_SOCKETS
 * is defined, we need to make sure the socket is bound to a specific
 * local IP address - passed in using the `local` structure.
 */
 rc = bindresvport(stream, &local);
 if (rc != 0)
 {
 if (retries >= MAX_RETRIES)
 {
 DBPRT(("could not bind local socket: %s", strerror(errno)));
 close(stream);
 return(-1*errno);
 }
Expand Down

31 changes: 31 additions & 0 deletions
src/resmom/start_exec.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,9 @@ extern "C"
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#if IBM_SP2==2 /* IBM SP with PSSP 3.1 */
 #include <st_client.h>
#endif /* IBM SP */
Expand DownExpand Up@@ -804,6 +807,10 @@ int open_demux(
 torque_socklen_t slen;
 unsigned short local_port;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 memset(&remote, 0, sizeof(remote));
 remote.sin_addr.s_addr = addr;
 remote.sin_port = htons((unsigned short)port);
Expand All@@ -820,6 +827,30 @@ int open_demux(
 return(-1);
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != PBSE_NONE)
 {
 sprintf(log_buffer, "could not determine local IP address: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(local)))
 {
 sprintf(log_buffer, "could not bind local socket: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

#endif

 for (i = 0;i < RETRY;i++)
 {
 if (connect(sock, (struct sockaddr *)&remote, sizeof(remote)) == 0)
Expand Down

26 changes: 26 additions & 0 deletions
src/test/net_common/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
#include <stdio.h>
#include <errno.h>
#include <poll.h>
#include <sys/socket.h>
#include <netdb.h>
#include <unistd.h>

#include "pbs_error.h"
#include "net_cache.h"
Expand DownExpand Up@@ -144,6 +147,25 @@ START_TEST(test_socket_wait_for_write)
 }
END_TEST

START_TEST(test_get_local_address)
 {
 int rc;
 struct sockaddr_in new_sockaddr;
 char hostname[NI_MAXHOST];
 char hbuf[NI_MAXHOST];

 gethostname(hostname, sizeof(hostname));

 rc = get_local_address(new_sockaddr);
 fail_unless(rc == PBSE_NONE);

 rc = getnameinfo((struct sockaddr*)&new_sockaddr, sizeof(new_sockaddr), hbuf, sizeof(hbuf), NULL, 0, 0);

 fail_unless(rc == 0);
 fail_unless(strncmp(hostname, hbuf, NI_MAXHOST) == 0);
 }
END_TEST

Suite *net_common_suite(void)
 {
 Suite *s = suite_create("net_common_suite methods");
Expand DownExpand Up@@ -171,6 +193,10 @@ Suite *net_common_suite(void)
 tcase_add_test(tc_core, test_socket_wait_for_write);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_get_local_address");
 tcase_add_test(tc_core, test_get_local_address);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
TRQ-4072. Add bind() before client-side connect() calls by DanielSaunders · Pull Request #435 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4072. Add bind() before client-side connect() calls#435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4072. Add bind() before client-side connect() calls
#435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
configure.ac

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1858,6 +1858,18 @@ esac



dnl Make a bind() call before making a connect() call
AC_MSG_CHECKING([whether to build with bind() calls before connect() calls])
AC_ARG_ENABLE(bind-outbound-sockets,
 [ --enable-bind-outbound-sockets enable build with bind() calls before connect() calls],
 BIND_OUTBOUND_SOCKETS=$enableval,BIND_OUTBOUND_SOCKETS=yes)
AC_MSG_RESULT($BIND_OUTBOUND_SOCKETS)
if test "$BIND_OUTBOUND_SOCKETS" = "yes" ; then
	AC_DEFINE(BIND_OUTBOUND_SOCKETS, 1, [turns on the compilation of BIND_OUTBOUND_SOCKETS code])
fi



dnl
dnl ######################################################################
dnl Scheduler settings
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/tm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,6 +484,11 @@ static int localmom(void)

 struct linger ltime;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif


 if (local_conn >= 0)
 {
 return(local_conn); /* already have open connection */
Expand DownExpand Up@@ -528,6 +533,27 @@ static int localmom(void)

#endif

#ifdef BIND_OUTBOUND_SOCKETS

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != 0)
 {
 TM_DBPRT(("tm_init: unable to determine local IP address"));
 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)) != 0)
 {
 TM_DBPRT(("tm_init: unable to bind to local IP address"));
 close(sock);
 return(-1);
 }
#endif


 /* make sure data goes out */

 ltime.l_onoff = 1;
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/trq_auth.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -331,6 +331,19 @@ int trq_simple_connect(
 int optval = 1;
 std::string server(server_name);

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(PBSE_SYSTEM);
 }

#endif

 memset(&hints, 0, sizeof(hints));
 /* set the hints so we get a STREAM socket */
 hints.ai_family = AF_UNSPEC; /* allow for IPv4 or IPv6 */
Expand DownExpand Up@@ -365,6 +378,19 @@ int trq_simple_connect(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS

 rc = bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in));
 if (rc != 0)
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 rc = PBSE_SYSTEM;
 close(sock);
 continue;
 }

#endif

 rc = connect(sock, addr_info->ai_addr, addr_info->ai_addrlen);
 if (rc != 0)
 {
Expand Down

1 change: 1 addition & 0 deletions
src/lib/Libnet/lib_net.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ int socket_read_str(int socket, char **the_str, long long *str_len);
int socket_close(int socket);
int pbs_getaddrinfo(const char *pNode,struct addrinfo *pHints,struct addrinfo **ppAddrInfoOut);
int connect_to_trqauthd(int *sock);
int get_local_address(struct sockaddr_in &new_sockaddr);


/* from file server_core.c */
Expand Down

64 changes: 59 additions & 5 deletions
src/lib/Libnet/net_common.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,13 +205,22 @@ int socket_get_tcp_priv()
 int priv_port = 0;
 int flags;
#endif

 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;


 if ((local_socket = socket_get_tcp()) < 0)
 return(-1);

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 close(local_socket);
 return(-1);
 }
#else
 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;
#endif


#ifndef NOPRIVPORTS
 /* According to the notes in the previous code:
 * bindresvport seems to cause connect() failures in some odd corner case
Expand DownExpand Up@@ -1030,4 +1039,49 @@ int connect_to_trqauthd(
 return(rc);
 }



/*
 * get_local_address() - lookup the local IP address associated with the local,
 * public hostname.
 *
 * This function will cache the IP address in each process to speed up
 * frequent lookups.
 */
int get_local_address(

 struct sockaddr_in &new_sockaddr)

 {
 static struct addrinfo *local_addr_info = NULL;
 struct addrinfo hints;
 int rc;
 char hostname[PBS_MAXHOSTNAME];
 hostname[PBS_MAXHOSTNAME - 1] = '\0';

 // If we already have the local address cached, return (copy) that value.
 if (local_addr_info != NULL)
 {
 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 memset(&hints, 0, sizeof(hints));
 hints.ai_family = AF_INET;
 hints.ai_socktype = SOCK_STREAM;

 gethostname(hostname, sizeof(hostname));

 rc = getaddrinfo(hostname, NULL, &hints, &local_addr_info);
 if (rc != 0)
 {
 return(rc);
 }

 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }


25 changes: 25 additions & 0 deletions
src/lib/Libnet/port_forwarding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <poll.h>
#include "lib_ifl.h"
#include "lib_net.h"


#include "port_forwarding.h"
Expand DownExpand Up@@ -335,6 +336,9 @@ int x11_connect_display(
 char buf[1024], *cp;

 struct addrinfo hints, *ai, *aitop;
#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 char strport[NI_MAXSERV];

Expand DownExpand Up@@ -413,6 +417,14 @@ int x11_connect_display(
 return -1;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(-1);
 }
#endif

 for (ai = aitop; ai; ai = ai->ai_next)
 {
 /* Create a socket. */
Expand All@@ -424,6 +436,19 @@ int x11_connect_display(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)))
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 close(sock);
 continue;
 }

#endif

 /* Connect it to the display. */
 if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0)
 {
Expand Down

27 changes: 23 additions & 4 deletions
src/lib/Libnet/rm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,7 @@ int openrm(

 struct sockaddr_in addr;
 struct addrinfo *addr_info;
 struct sockaddr_in local;

 if (pbs_getaddrinfo(host, NULL, &addr_info) != 0)
 {
Expand All@@ -216,18 +217,36 @@ int openrm(
 return(ENOENT * -1);
 }

 memset(&addr, '\0', sizeof(addr));
#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 DBPRT(("could not determine local IP address: %s", strerror(errno)));
 close(stream);
 return(-1);
 }

 addr.sin_family = AF_INET;
 addr.sin_addr.s_addr = htonl(INADDR_ANY);
#else

 memset(&local, 0, sizeof(struct sockaddr_in));

 local.sin_family = AF_INET;

#endif

 while (retries++ < MAX_RETRIES)
 {
 rc = bindresvport(stream, &addr);
 /* Attempt to bind to any reserved port that is free. If BIND_OUTBOUND_SOCKETS
 * is defined, we need to make sure the socket is bound to a specific
 * local IP address - passed in using the `local` structure.
 */
 rc = bindresvport(stream, &local);
 if (rc != 0)
 {
 if (retries >= MAX_RETRIES)
 {
 DBPRT(("could not bind local socket: %s", strerror(errno)));
 close(stream);
 return(-1*errno);
 }
Expand Down

31 changes: 31 additions & 0 deletions
src/resmom/start_exec.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,9 @@ extern "C"
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#if IBM_SP2==2 /* IBM SP with PSSP 3.1 */
 #include <st_client.h>
#endif /* IBM SP */
Expand DownExpand Up@@ -804,6 +807,10 @@ int open_demux(
 torque_socklen_t slen;
 unsigned short local_port;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 memset(&remote, 0, sizeof(remote));
 remote.sin_addr.s_addr = addr;
 remote.sin_port = htons((unsigned short)port);
Expand All@@ -820,6 +827,30 @@ int open_demux(
 return(-1);
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != PBSE_NONE)
 {
 sprintf(log_buffer, "could not determine local IP address: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(local)))
 {
 sprintf(log_buffer, "could not bind local socket: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

#endif

 for (i = 0;i < RETRY;i++)
 {
 if (connect(sock, (struct sockaddr *)&remote, sizeof(remote)) == 0)
Expand Down

26 changes: 26 additions & 0 deletions
src/test/net_common/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
#include <stdio.h>
#include <errno.h>
#include <poll.h>
#include <sys/socket.h>
#include <netdb.h>
#include <unistd.h>

#include "pbs_error.h"
#include "net_cache.h"
Expand DownExpand Up@@ -144,6 +147,25 @@ START_TEST(test_socket_wait_for_write)
 }
END_TEST

START_TEST(test_get_local_address)
 {
 int rc;
 struct sockaddr_in new_sockaddr;
 char hostname[NI_MAXHOST];
 char hbuf[NI_MAXHOST];

 gethostname(hostname, sizeof(hostname));

 rc = get_local_address(new_sockaddr);
 fail_unless(rc == PBSE_NONE);

 rc = getnameinfo((struct sockaddr*)&new_sockaddr, sizeof(new_sockaddr), hbuf, sizeof(hbuf), NULL, 0, 0);

 fail_unless(rc == 0);
 fail_unless(strncmp(hostname, hbuf, NI_MAXHOST) == 0);
 }
END_TEST

Suite *net_common_suite(void)
 {
 Suite *s = suite_create("net_common_suite methods");
Expand DownExpand Up@@ -171,6 +193,10 @@ Suite *net_common_suite(void)
 tcase_add_test(tc_core, test_socket_wait_for_write);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_get_local_address");
 tcase_add_test(tc_core, test_get_local_address);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
TRQ-4072. Add bind() before client-side connect() calls by DanielSaunders · Pull Request #435 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4072. Add bind() before client-side connect() calls#435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4072. Add bind() before client-side connect() calls
#435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
configure.ac

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1858,6 +1858,18 @@ esac



dnl Make a bind() call before making a connect() call
AC_MSG_CHECKING([whether to build with bind() calls before connect() calls])
AC_ARG_ENABLE(bind-outbound-sockets,
 [ --enable-bind-outbound-sockets enable build with bind() calls before connect() calls],
 BIND_OUTBOUND_SOCKETS=$enableval,BIND_OUTBOUND_SOCKETS=yes)
AC_MSG_RESULT($BIND_OUTBOUND_SOCKETS)
if test "$BIND_OUTBOUND_SOCKETS" = "yes" ; then
	AC_DEFINE(BIND_OUTBOUND_SOCKETS, 1, [turns on the compilation of BIND_OUTBOUND_SOCKETS code])
fi



dnl
dnl ######################################################################
dnl Scheduler settings
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/tm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,6 +484,11 @@ static int localmom(void)

 struct linger ltime;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif


 if (local_conn >= 0)
 {
 return(local_conn); /* already have open connection */
Expand DownExpand Up@@ -528,6 +533,27 @@ static int localmom(void)

#endif

#ifdef BIND_OUTBOUND_SOCKETS

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != 0)
 {
 TM_DBPRT(("tm_init: unable to determine local IP address"));
 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)) != 0)
 {
 TM_DBPRT(("tm_init: unable to bind to local IP address"));
 close(sock);
 return(-1);
 }
#endif


 /* make sure data goes out */

 ltime.l_onoff = 1;
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/trq_auth.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -331,6 +331,19 @@ int trq_simple_connect(
 int optval = 1;
 std::string server(server_name);

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(PBSE_SYSTEM);
 }

#endif

 memset(&hints, 0, sizeof(hints));
 /* set the hints so we get a STREAM socket */
 hints.ai_family = AF_UNSPEC; /* allow for IPv4 or IPv6 */
Expand DownExpand Up@@ -365,6 +378,19 @@ int trq_simple_connect(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS

 rc = bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in));
 if (rc != 0)
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 rc = PBSE_SYSTEM;
 close(sock);
 continue;
 }

#endif

 rc = connect(sock, addr_info->ai_addr, addr_info->ai_addrlen);
 if (rc != 0)
 {
Expand Down

1 change: 1 addition & 0 deletions
src/lib/Libnet/lib_net.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ int socket_read_str(int socket, char **the_str, long long *str_len);
int socket_close(int socket);
int pbs_getaddrinfo(const char *pNode,struct addrinfo *pHints,struct addrinfo **ppAddrInfoOut);
int connect_to_trqauthd(int *sock);
int get_local_address(struct sockaddr_in &new_sockaddr);


/* from file server_core.c */
Expand Down

64 changes: 59 additions & 5 deletions
src/lib/Libnet/net_common.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,13 +205,22 @@ int socket_get_tcp_priv()
 int priv_port = 0;
 int flags;
#endif

 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;


 if ((local_socket = socket_get_tcp()) < 0)
 return(-1);

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 close(local_socket);
 return(-1);
 }
#else
 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;
#endif


#ifndef NOPRIVPORTS
 /* According to the notes in the previous code:
 * bindresvport seems to cause connect() failures in some odd corner case
Expand DownExpand Up@@ -1030,4 +1039,49 @@ int connect_to_trqauthd(
 return(rc);
 }



/*
 * get_local_address() - lookup the local IP address associated with the local,
 * public hostname.
 *
 * This function will cache the IP address in each process to speed up
 * frequent lookups.
 */
int get_local_address(

 struct sockaddr_in &new_sockaddr)

 {
 static struct addrinfo *local_addr_info = NULL;
 struct addrinfo hints;
 int rc;
 char hostname[PBS_MAXHOSTNAME];
 hostname[PBS_MAXHOSTNAME - 1] = '\0';

 // If we already have the local address cached, return (copy) that value.
 if (local_addr_info != NULL)
 {
 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 memset(&hints, 0, sizeof(hints));
 hints.ai_family = AF_INET;
 hints.ai_socktype = SOCK_STREAM;

 gethostname(hostname, sizeof(hostname));

 rc = getaddrinfo(hostname, NULL, &hints, &local_addr_info);
 if (rc != 0)
 {
 return(rc);
 }

 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }


25 changes: 25 additions & 0 deletions
src/lib/Libnet/port_forwarding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <poll.h>
#include "lib_ifl.h"
#include "lib_net.h"


#include "port_forwarding.h"
Expand DownExpand Up@@ -335,6 +336,9 @@ int x11_connect_display(
 char buf[1024], *cp;

 struct addrinfo hints, *ai, *aitop;
#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 char strport[NI_MAXSERV];

Expand DownExpand Up@@ -413,6 +417,14 @@ int x11_connect_display(
 return -1;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(-1);
 }
#endif

 for (ai = aitop; ai; ai = ai->ai_next)
 {
 /* Create a socket. */
Expand All@@ -424,6 +436,19 @@ int x11_connect_display(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)))
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 close(sock);
 continue;
 }

#endif

 /* Connect it to the display. */
 if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0)
 {
Expand Down

27 changes: 23 additions & 4 deletions
src/lib/Libnet/rm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,7 @@ int openrm(

 struct sockaddr_in addr;
 struct addrinfo *addr_info;
 struct sockaddr_in local;

 if (pbs_getaddrinfo(host, NULL, &addr_info) != 0)
 {
Expand All@@ -216,18 +217,36 @@ int openrm(
 return(ENOENT * -1);
 }

 memset(&addr, '\0', sizeof(addr));
#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 DBPRT(("could not determine local IP address: %s", strerror(errno)));
 close(stream);
 return(-1);
 }

 addr.sin_family = AF_INET;
 addr.sin_addr.s_addr = htonl(INADDR_ANY);
#else

 memset(&local, 0, sizeof(struct sockaddr_in));

 local.sin_family = AF_INET;

#endif

 while (retries++ < MAX_RETRIES)
 {
 rc = bindresvport(stream, &addr);
 /* Attempt to bind to any reserved port that is free. If BIND_OUTBOUND_SOCKETS
 * is defined, we need to make sure the socket is bound to a specific
 * local IP address - passed in using the `local` structure.
 */
 rc = bindresvport(stream, &local);
 if (rc != 0)
 {
 if (retries >= MAX_RETRIES)
 {
 DBPRT(("could not bind local socket: %s", strerror(errno)));
 close(stream);
 return(-1*errno);
 }
Expand Down

31 changes: 31 additions & 0 deletions
src/resmom/start_exec.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,9 @@ extern "C"
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#if IBM_SP2==2 /* IBM SP with PSSP 3.1 */
 #include <st_client.h>
#endif /* IBM SP */
Expand DownExpand Up@@ -804,6 +807,10 @@ int open_demux(
 torque_socklen_t slen;
 unsigned short local_port;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 memset(&remote, 0, sizeof(remote));
 remote.sin_addr.s_addr = addr;
 remote.sin_port = htons((unsigned short)port);
Expand All@@ -820,6 +827,30 @@ int open_demux(
 return(-1);
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != PBSE_NONE)
 {
 sprintf(log_buffer, "could not determine local IP address: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(local)))
 {
 sprintf(log_buffer, "could not bind local socket: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

#endif

 for (i = 0;i < RETRY;i++)
 {
 if (connect(sock, (struct sockaddr *)&remote, sizeof(remote)) == 0)
Expand Down

26 changes: 26 additions & 0 deletions
src/test/net_common/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
#include <stdio.h>
#include <errno.h>
#include <poll.h>
#include <sys/socket.h>
#include <netdb.h>
#include <unistd.h>

#include "pbs_error.h"
#include "net_cache.h"
Expand DownExpand Up@@ -144,6 +147,25 @@ START_TEST(test_socket_wait_for_write)
 }
END_TEST

START_TEST(test_get_local_address)
 {
 int rc;
 struct sockaddr_in new_sockaddr;
 char hostname[NI_MAXHOST];
 char hbuf[NI_MAXHOST];

 gethostname(hostname, sizeof(hostname));

 rc = get_local_address(new_sockaddr);
 fail_unless(rc == PBSE_NONE);

 rc = getnameinfo((struct sockaddr*)&new_sockaddr, sizeof(new_sockaddr), hbuf, sizeof(hbuf), NULL, 0, 0);

 fail_unless(rc == 0);
 fail_unless(strncmp(hostname, hbuf, NI_MAXHOST) == 0);
 }
END_TEST

Suite *net_common_suite(void)
 {
 Suite *s = suite_create("net_common_suite methods");
Expand DownExpand Up@@ -171,6 +193,10 @@ Suite *net_common_suite(void)
 tcase_add_test(tc_core, test_socket_wait_for_write);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_get_local_address");
 tcase_add_test(tc_core, test_get_local_address);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
TRQ-4072. Add bind() before client-side connect() calls by DanielSaunders · Pull Request #435 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4072. Add bind() before client-side connect() calls#435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4072. Add bind() before client-side connect() calls
#435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
configure.ac

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1858,6 +1858,18 @@ esac



dnl Make a bind() call before making a connect() call
AC_MSG_CHECKING([whether to build with bind() calls before connect() calls])
AC_ARG_ENABLE(bind-outbound-sockets,
 [ --enable-bind-outbound-sockets enable build with bind() calls before connect() calls],
 BIND_OUTBOUND_SOCKETS=$enableval,BIND_OUTBOUND_SOCKETS=yes)
AC_MSG_RESULT($BIND_OUTBOUND_SOCKETS)
if test "$BIND_OUTBOUND_SOCKETS" = "yes" ; then
	AC_DEFINE(BIND_OUTBOUND_SOCKETS, 1, [turns on the compilation of BIND_OUTBOUND_SOCKETS code])
fi



dnl
dnl ######################################################################
dnl Scheduler settings
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/tm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,6 +484,11 @@ static int localmom(void)

 struct linger ltime;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif


 if (local_conn >= 0)
 {
 return(local_conn); /* already have open connection */
Expand DownExpand Up@@ -528,6 +533,27 @@ static int localmom(void)

#endif

#ifdef BIND_OUTBOUND_SOCKETS

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != 0)
 {
 TM_DBPRT(("tm_init: unable to determine local IP address"));
 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)) != 0)
 {
 TM_DBPRT(("tm_init: unable to bind to local IP address"));
 close(sock);
 return(-1);
 }
#endif


 /* make sure data goes out */

 ltime.l_onoff = 1;
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/trq_auth.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -331,6 +331,19 @@ int trq_simple_connect(
 int optval = 1;
 std::string server(server_name);

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(PBSE_SYSTEM);
 }

#endif

 memset(&hints, 0, sizeof(hints));
 /* set the hints so we get a STREAM socket */
 hints.ai_family = AF_UNSPEC; /* allow for IPv4 or IPv6 */
Expand DownExpand Up@@ -365,6 +378,19 @@ int trq_simple_connect(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS

 rc = bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in));
 if (rc != 0)
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 rc = PBSE_SYSTEM;
 close(sock);
 continue;
 }

#endif

 rc = connect(sock, addr_info->ai_addr, addr_info->ai_addrlen);
 if (rc != 0)
 {
Expand Down

1 change: 1 addition & 0 deletions
src/lib/Libnet/lib_net.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ int socket_read_str(int socket, char **the_str, long long *str_len);
int socket_close(int socket);
int pbs_getaddrinfo(const char *pNode,struct addrinfo *pHints,struct addrinfo **ppAddrInfoOut);
int connect_to_trqauthd(int *sock);
int get_local_address(struct sockaddr_in &new_sockaddr);


/* from file server_core.c */
Expand Down

64 changes: 59 additions & 5 deletions
src/lib/Libnet/net_common.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,13 +205,22 @@ int socket_get_tcp_priv()
 int priv_port = 0;
 int flags;
#endif

 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;


 if ((local_socket = socket_get_tcp()) < 0)
 return(-1);

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 close(local_socket);
 return(-1);
 }
#else
 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;
#endif


#ifndef NOPRIVPORTS
 /* According to the notes in the previous code:
 * bindresvport seems to cause connect() failures in some odd corner case
Expand DownExpand Up@@ -1030,4 +1039,49 @@ int connect_to_trqauthd(
 return(rc);
 }



/*
 * get_local_address() - lookup the local IP address associated with the local,
 * public hostname.
 *
 * This function will cache the IP address in each process to speed up
 * frequent lookups.
 */
int get_local_address(

 struct sockaddr_in &new_sockaddr)

 {
 static struct addrinfo *local_addr_info = NULL;
 struct addrinfo hints;
 int rc;
 char hostname[PBS_MAXHOSTNAME];
 hostname[PBS_MAXHOSTNAME - 1] = '\0';

 // If we already have the local address cached, return (copy) that value.
 if (local_addr_info != NULL)
 {
 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 memset(&hints, 0, sizeof(hints));
 hints.ai_family = AF_INET;
 hints.ai_socktype = SOCK_STREAM;

 gethostname(hostname, sizeof(hostname));

 rc = getaddrinfo(hostname, NULL, &hints, &local_addr_info);
 if (rc != 0)
 {
 return(rc);
 }

 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }


25 changes: 25 additions & 0 deletions
src/lib/Libnet/port_forwarding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <poll.h>
#include "lib_ifl.h"
#include "lib_net.h"


#include "port_forwarding.h"
Expand DownExpand Up@@ -335,6 +336,9 @@ int x11_connect_display(
 char buf[1024], *cp;

 struct addrinfo hints, *ai, *aitop;
#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 char strport[NI_MAXSERV];

Expand DownExpand Up@@ -413,6 +417,14 @@ int x11_connect_display(
 return -1;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(-1);
 }
#endif

 for (ai = aitop; ai; ai = ai->ai_next)
 {
 /* Create a socket. */
Expand All@@ -424,6 +436,19 @@ int x11_connect_display(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)))
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 close(sock);
 continue;
 }

#endif

 /* Connect it to the display. */
 if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0)
 {
Expand Down

27 changes: 23 additions & 4 deletions
src/lib/Libnet/rm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,7 @@ int openrm(

 struct sockaddr_in addr;
 struct addrinfo *addr_info;
 struct sockaddr_in local;

 if (pbs_getaddrinfo(host, NULL, &addr_info) != 0)
 {
Expand All@@ -216,18 +217,36 @@ int openrm(
 return(ENOENT * -1);
 }

 memset(&addr, '\0', sizeof(addr));
#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 DBPRT(("could not determine local IP address: %s", strerror(errno)));
 close(stream);
 return(-1);
 }

 addr.sin_family = AF_INET;
 addr.sin_addr.s_addr = htonl(INADDR_ANY);
#else

 memset(&local, 0, sizeof(struct sockaddr_in));

 local.sin_family = AF_INET;

#endif

 while (retries++ < MAX_RETRIES)
 {
 rc = bindresvport(stream, &addr);
 /* Attempt to bind to any reserved port that is free. If BIND_OUTBOUND_SOCKETS
 * is defined, we need to make sure the socket is bound to a specific
 * local IP address - passed in using the `local` structure.
 */
 rc = bindresvport(stream, &local);
 if (rc != 0)
 {
 if (retries >= MAX_RETRIES)
 {
 DBPRT(("could not bind local socket: %s", strerror(errno)));
 close(stream);
 return(-1*errno);
 }
Expand Down

31 changes: 31 additions & 0 deletions
src/resmom/start_exec.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,9 @@ extern "C"
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#if IBM_SP2==2 /* IBM SP with PSSP 3.1 */
 #include <st_client.h>
#endif /* IBM SP */
Expand DownExpand Up@@ -804,6 +807,10 @@ int open_demux(
 torque_socklen_t slen;
 unsigned short local_port;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 memset(&remote, 0, sizeof(remote));
 remote.sin_addr.s_addr = addr;
 remote.sin_port = htons((unsigned short)port);
Expand All@@ -820,6 +827,30 @@ int open_demux(
 return(-1);
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != PBSE_NONE)
 {
 sprintf(log_buffer, "could not determine local IP address: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(local)))
 {
 sprintf(log_buffer, "could not bind local socket: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

#endif

 for (i = 0;i < RETRY;i++)
 {
 if (connect(sock, (struct sockaddr *)&remote, sizeof(remote)) == 0)
Expand Down

26 changes: 26 additions & 0 deletions
src/test/net_common/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
#include <stdio.h>
#include <errno.h>
#include <poll.h>
#include <sys/socket.h>
#include <netdb.h>
#include <unistd.h>

#include "pbs_error.h"
#include "net_cache.h"
Expand DownExpand Up@@ -144,6 +147,25 @@ START_TEST(test_socket_wait_for_write)
 }
END_TEST

START_TEST(test_get_local_address)
 {
 int rc;
 struct sockaddr_in new_sockaddr;
 char hostname[NI_MAXHOST];
 char hbuf[NI_MAXHOST];

 gethostname(hostname, sizeof(hostname));

 rc = get_local_address(new_sockaddr);
 fail_unless(rc == PBSE_NONE);

 rc = getnameinfo((struct sockaddr*)&new_sockaddr, sizeof(new_sockaddr), hbuf, sizeof(hbuf), NULL, 0, 0);

 fail_unless(rc == 0);
 fail_unless(strncmp(hostname, hbuf, NI_MAXHOST) == 0);
 }
END_TEST

Suite *net_common_suite(void)
 {
 Suite *s = suite_create("net_common_suite methods");
Expand DownExpand Up@@ -171,6 +193,10 @@ Suite *net_common_suite(void)
 tcase_add_test(tc_core, test_socket_wait_for_write);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_get_local_address");
 tcase_add_test(tc_core, test_get_local_address);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
TRQ-4072. Add bind() before client-side connect() calls by DanielSaunders · Pull Request #435 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4072. Add bind() before client-side connect() calls#435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4072. Add bind() before client-side connect() calls
#435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
configure.ac

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1858,6 +1858,18 @@ esac



dnl Make a bind() call before making a connect() call
AC_MSG_CHECKING([whether to build with bind() calls before connect() calls])
AC_ARG_ENABLE(bind-outbound-sockets,
 [ --enable-bind-outbound-sockets enable build with bind() calls before connect() calls],
 BIND_OUTBOUND_SOCKETS=$enableval,BIND_OUTBOUND_SOCKETS=yes)
AC_MSG_RESULT($BIND_OUTBOUND_SOCKETS)
if test "$BIND_OUTBOUND_SOCKETS" = "yes" ; then
	AC_DEFINE(BIND_OUTBOUND_SOCKETS, 1, [turns on the compilation of BIND_OUTBOUND_SOCKETS code])
fi



dnl
dnl ######################################################################
dnl Scheduler settings
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/tm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,6 +484,11 @@ static int localmom(void)

 struct linger ltime;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif


 if (local_conn >= 0)
 {
 return(local_conn); /* already have open connection */
Expand DownExpand Up@@ -528,6 +533,27 @@ static int localmom(void)

#endif

#ifdef BIND_OUTBOUND_SOCKETS

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != 0)
 {
 TM_DBPRT(("tm_init: unable to determine local IP address"));
 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)) != 0)
 {
 TM_DBPRT(("tm_init: unable to bind to local IP address"));
 close(sock);
 return(-1);
 }
#endif


 /* make sure data goes out */

 ltime.l_onoff = 1;
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/trq_auth.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -331,6 +331,19 @@ int trq_simple_connect(
 int optval = 1;
 std::string server(server_name);

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(PBSE_SYSTEM);
 }

#endif

 memset(&hints, 0, sizeof(hints));
 /* set the hints so we get a STREAM socket */
 hints.ai_family = AF_UNSPEC; /* allow for IPv4 or IPv6 */
Expand DownExpand Up@@ -365,6 +378,19 @@ int trq_simple_connect(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS

 rc = bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in));
 if (rc != 0)
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 rc = PBSE_SYSTEM;
 close(sock);
 continue;
 }

#endif

 rc = connect(sock, addr_info->ai_addr, addr_info->ai_addrlen);
 if (rc != 0)
 {
Expand Down

1 change: 1 addition & 0 deletions
src/lib/Libnet/lib_net.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ int socket_read_str(int socket, char **the_str, long long *str_len);
int socket_close(int socket);
int pbs_getaddrinfo(const char *pNode,struct addrinfo *pHints,struct addrinfo **ppAddrInfoOut);
int connect_to_trqauthd(int *sock);
int get_local_address(struct sockaddr_in &new_sockaddr);


/* from file server_core.c */
Expand Down

64 changes: 59 additions & 5 deletions
src/lib/Libnet/net_common.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,13 +205,22 @@ int socket_get_tcp_priv()
 int priv_port = 0;
 int flags;
#endif

 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;


 if ((local_socket = socket_get_tcp()) < 0)
 return(-1);

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 close(local_socket);
 return(-1);
 }
#else
 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;
#endif


#ifndef NOPRIVPORTS
 /* According to the notes in the previous code:
 * bindresvport seems to cause connect() failures in some odd corner case
Expand DownExpand Up@@ -1030,4 +1039,49 @@ int connect_to_trqauthd(
 return(rc);
 }



/*
 * get_local_address() - lookup the local IP address associated with the local,
 * public hostname.
 *
 * This function will cache the IP address in each process to speed up
 * frequent lookups.
 */
int get_local_address(

 struct sockaddr_in &new_sockaddr)

 {
 static struct addrinfo *local_addr_info = NULL;
 struct addrinfo hints;
 int rc;
 char hostname[PBS_MAXHOSTNAME];
 hostname[PBS_MAXHOSTNAME - 1] = '\0';

 // If we already have the local address cached, return (copy) that value.
 if (local_addr_info != NULL)
 {
 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 memset(&hints, 0, sizeof(hints));
 hints.ai_family = AF_INET;
 hints.ai_socktype = SOCK_STREAM;

 gethostname(hostname, sizeof(hostname));

 rc = getaddrinfo(hostname, NULL, &hints, &local_addr_info);
 if (rc != 0)
 {
 return(rc);
 }

 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }


25 changes: 25 additions & 0 deletions
src/lib/Libnet/port_forwarding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <poll.h>
#include "lib_ifl.h"
#include "lib_net.h"


#include "port_forwarding.h"
Expand DownExpand Up@@ -335,6 +336,9 @@ int x11_connect_display(
 char buf[1024], *cp;

 struct addrinfo hints, *ai, *aitop;
#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 char strport[NI_MAXSERV];

Expand DownExpand Up@@ -413,6 +417,14 @@ int x11_connect_display(
 return -1;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(-1);
 }
#endif

 for (ai = aitop; ai; ai = ai->ai_next)
 {
 /* Create a socket. */
Expand All@@ -424,6 +436,19 @@ int x11_connect_display(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)))
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 close(sock);
 continue;
 }

#endif

 /* Connect it to the display. */
 if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0)
 {
Expand Down

27 changes: 23 additions & 4 deletions
src/lib/Libnet/rm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,7 @@ int openrm(

 struct sockaddr_in addr;
 struct addrinfo *addr_info;
 struct sockaddr_in local;

 if (pbs_getaddrinfo(host, NULL, &addr_info) != 0)
 {
Expand All@@ -216,18 +217,36 @@ int openrm(
 return(ENOENT * -1);
 }

 memset(&addr, '\0', sizeof(addr));
#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 DBPRT(("could not determine local IP address: %s", strerror(errno)));
 close(stream);
 return(-1);
 }

 addr.sin_family = AF_INET;
 addr.sin_addr.s_addr = htonl(INADDR_ANY);
#else

 memset(&local, 0, sizeof(struct sockaddr_in));

 local.sin_family = AF_INET;

#endif

 while (retries++ < MAX_RETRIES)
 {
 rc = bindresvport(stream, &addr);
 /* Attempt to bind to any reserved port that is free. If BIND_OUTBOUND_SOCKETS
 * is defined, we need to make sure the socket is bound to a specific
 * local IP address - passed in using the `local` structure.
 */
 rc = bindresvport(stream, &local);
 if (rc != 0)
 {
 if (retries >= MAX_RETRIES)
 {
 DBPRT(("could not bind local socket: %s", strerror(errno)));
 close(stream);
 return(-1*errno);
 }
Expand Down

31 changes: 31 additions & 0 deletions
src/resmom/start_exec.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,9 @@ extern "C"
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#if IBM_SP2==2 /* IBM SP with PSSP 3.1 */
 #include <st_client.h>
#endif /* IBM SP */
Expand DownExpand Up@@ -804,6 +807,10 @@ int open_demux(
 torque_socklen_t slen;
 unsigned short local_port;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 memset(&remote, 0, sizeof(remote));
 remote.sin_addr.s_addr = addr;
 remote.sin_port = htons((unsigned short)port);
Expand All@@ -820,6 +827,30 @@ int open_demux(
 return(-1);
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != PBSE_NONE)
 {
 sprintf(log_buffer, "could not determine local IP address: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(local)))
 {
 sprintf(log_buffer, "could not bind local socket: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

#endif

 for (i = 0;i < RETRY;i++)
 {
 if (connect(sock, (struct sockaddr *)&remote, sizeof(remote)) == 0)
Expand Down

26 changes: 26 additions & 0 deletions
src/test/net_common/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
#include <stdio.h>
#include <errno.h>
#include <poll.h>
#include <sys/socket.h>
#include <netdb.h>
#include <unistd.h>

#include "pbs_error.h"
#include "net_cache.h"
Expand DownExpand Up@@ -144,6 +147,25 @@ START_TEST(test_socket_wait_for_write)
 }
END_TEST

START_TEST(test_get_local_address)
 {
 int rc;
 struct sockaddr_in new_sockaddr;
 char hostname[NI_MAXHOST];
 char hbuf[NI_MAXHOST];

 gethostname(hostname, sizeof(hostname));

 rc = get_local_address(new_sockaddr);
 fail_unless(rc == PBSE_NONE);

 rc = getnameinfo((struct sockaddr*)&new_sockaddr, sizeof(new_sockaddr), hbuf, sizeof(hbuf), NULL, 0, 0);

 fail_unless(rc == 0);
 fail_unless(strncmp(hostname, hbuf, NI_MAXHOST) == 0);
 }
END_TEST

Suite *net_common_suite(void)
 {
 Suite *s = suite_create("net_common_suite methods");
Expand DownExpand Up@@ -171,6 +193,10 @@ Suite *net_common_suite(void)
 tcase_add_test(tc_core, test_socket_wait_for_write);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_get_local_address");
 tcase_add_test(tc_core, test_get_local_address);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
TRQ-4072. Add bind() before client-side connect() calls by DanielSaunders · Pull Request #435 · adaptivecomputing/torque · GitHub
Skip to content
TRQ-4072. Add bind() before client-side connect() calls#435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

acvizi
merged 1 commit into

from

Sep 18, 2017
 Merged


TRQ-4072. Add bind() before client-side connect() calls
#435
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


12 changes: 12 additions & 0 deletions
configure.ac

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1858,6 +1858,18 @@ esac



dnl Make a bind() call before making a connect() call
AC_MSG_CHECKING([whether to build with bind() calls before connect() calls])
AC_ARG_ENABLE(bind-outbound-sockets,
 [ --enable-bind-outbound-sockets enable build with bind() calls before connect() calls],
 BIND_OUTBOUND_SOCKETS=$enableval,BIND_OUTBOUND_SOCKETS=yes)
AC_MSG_RESULT($BIND_OUTBOUND_SOCKETS)
if test "$BIND_OUTBOUND_SOCKETS" = "yes" ; then
	AC_DEFINE(BIND_OUTBOUND_SOCKETS, 1, [turns on the compilation of BIND_OUTBOUND_SOCKETS code])
fi



dnl
dnl ######################################################################
dnl Scheduler settings
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/tm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -484,6 +484,11 @@ static int localmom(void)

 struct linger ltime;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif


 if (local_conn >= 0)
 {
 return(local_conn); /* already have open connection */
Expand DownExpand Up@@ -528,6 +533,27 @@ static int localmom(void)

#endif

#ifdef BIND_OUTBOUND_SOCKETS

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != 0)
 {
 TM_DBPRT(("tm_init: unable to determine local IP address"));
 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)) != 0)
 {
 TM_DBPRT(("tm_init: unable to bind to local IP address"));
 close(sock);
 return(-1);
 }
#endif


 /* make sure data goes out */

 ltime.l_onoff = 1;
Expand Down

26 changes: 26 additions & 0 deletions
src/lib/Libifl/trq_auth.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -331,6 +331,19 @@ int trq_simple_connect(
 int optval = 1;
 std::string server(server_name);

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(PBSE_SYSTEM);
 }

#endif

 memset(&hints, 0, sizeof(hints));
 /* set the hints so we get a STREAM socket */
 hints.ai_family = AF_UNSPEC; /* allow for IPv4 or IPv6 */
Expand DownExpand Up@@ -365,6 +378,19 @@ int trq_simple_connect(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS

 rc = bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in));
 if (rc != 0)
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 rc = PBSE_SYSTEM;
 close(sock);
 continue;
 }

#endif

 rc = connect(sock, addr_info->ai_addr, addr_info->ai_addrlen);
 if (rc != 0)
 {
Expand Down

1 change: 1 addition & 0 deletions
src/lib/Libnet/lib_net.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ int socket_read_str(int socket, char **the_str, long long *str_len);
int socket_close(int socket);
int pbs_getaddrinfo(const char *pNode,struct addrinfo *pHints,struct addrinfo **ppAddrInfoOut);
int connect_to_trqauthd(int *sock);
int get_local_address(struct sockaddr_in &new_sockaddr);


/* from file server_core.c */
Expand Down

64 changes: 59 additions & 5 deletions
src/lib/Libnet/net_common.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -205,13 +205,22 @@ int socket_get_tcp_priv()
 int priv_port = 0;
 int flags;
#endif

 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;


 if ((local_socket = socket_get_tcp()) < 0)
 return(-1);

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 close(local_socket);
 return(-1);
 }
#else
 memset(&local, 0, sizeof(struct sockaddr_in));
 local.sin_family = AF_INET;
#endif


#ifndef NOPRIVPORTS
 /* According to the notes in the previous code:
 * bindresvport seems to cause connect() failures in some odd corner case
Expand DownExpand Up@@ -1030,4 +1039,49 @@ int connect_to_trqauthd(
 return(rc);
 }



/*
 * get_local_address() - lookup the local IP address associated with the local,
 * public hostname.
 *
 * This function will cache the IP address in each process to speed up
 * frequent lookups.
 */
int get_local_address(

 struct sockaddr_in &new_sockaddr)

 {
 static struct addrinfo *local_addr_info = NULL;
 struct addrinfo hints;
 int rc;
 char hostname[PBS_MAXHOSTNAME];
 hostname[PBS_MAXHOSTNAME - 1] = '\0';

 // If we already have the local address cached, return (copy) that value.
 if (local_addr_info != NULL)
 {
 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }

 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 memset(&hints, 0, sizeof(hints));
 hints.ai_family = AF_INET;
 hints.ai_socktype = SOCK_STREAM;

 gethostname(hostname, sizeof(hostname));

 rc = getaddrinfo(hostname, NULL, &hints, &local_addr_info);
 if (rc != 0)
 {
 return(rc);
 }

 new_sockaddr = *((sockaddr_in*)local_addr_info->ai_addr);

 return PBSE_NONE;
 }


25 changes: 25 additions & 0 deletions
src/lib/Libnet/port_forwarding.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <stdlib.h>
#include <poll.h>
#include "lib_ifl.h"
#include "lib_net.h"


#include "port_forwarding.h"
Expand DownExpand Up@@ -335,6 +336,9 @@ int x11_connect_display(
 char buf[1024], *cp;

 struct addrinfo hints, *ai, *aitop;
#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 char strport[NI_MAXSERV];

Expand DownExpand Up@@ -413,6 +417,14 @@ int x11_connect_display(
 return -1;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 if (get_local_address(local) != PBSE_NONE)
 {
 fprintf(stderr, "could not determine local IP address: %s", strerror(errno));
 return(-1);
 }
#endif

 for (ai = aitop; ai; ai = ai->ai_next)
 {
 /* Create a socket. */
Expand All@@ -424,6 +436,19 @@ int x11_connect_display(
 continue;
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (bind(sock, (struct sockaddr *)&local, sizeof(sockaddr_in)))
 {
 fprintf(stderr, "could not bind local socket: %s", strerror(errno));
 close(sock);
 continue;
 }

#endif

 /* Connect it to the display. */
 if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0)
 {
Expand Down

27 changes: 23 additions & 4 deletions
src/lib/Libnet/rm.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -207,6 +207,7 @@ int openrm(

 struct sockaddr_in addr;
 struct addrinfo *addr_info;
 struct sockaddr_in local;

 if (pbs_getaddrinfo(host, NULL, &addr_info) != 0)
 {
Expand All@@ -216,18 +217,36 @@ int openrm(
 return(ENOENT * -1);
 }

 memset(&addr, '\0', sizeof(addr));
#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/
 if (get_local_address(local) != PBSE_NONE)
 {
 DBPRT(("could not determine local IP address: %s", strerror(errno)));
 close(stream);
 return(-1);
 }

 addr.sin_family = AF_INET;
 addr.sin_addr.s_addr = htonl(INADDR_ANY);
#else

 memset(&local, 0, sizeof(struct sockaddr_in));

 local.sin_family = AF_INET;

#endif

 while (retries++ < MAX_RETRIES)
 {
 rc = bindresvport(stream, &addr);
 /* Attempt to bind to any reserved port that is free. If BIND_OUTBOUND_SOCKETS
 * is defined, we need to make sure the socket is bound to a specific
 * local IP address - passed in using the `local` structure.
 */
 rc = bindresvport(stream, &local);
 if (rc != 0)
 {
 if (retries >= MAX_RETRIES)
 {
 DBPRT(("could not bind local socket: %s", strerror(errno)));
 close(stream);
 return(-1*errno);
 }
Expand Down

31 changes: 31 additions & 0 deletions
src/resmom/start_exec.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,9 @@ extern "C"
#include <sys/wait.h>
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#if IBM_SP2==2 /* IBM SP with PSSP 3.1 */
 #include <st_client.h>
#endif /* IBM SP */
Expand DownExpand Up@@ -804,6 +807,10 @@ int open_demux(
 torque_socklen_t slen;
 unsigned short local_port;

#ifdef BIND_OUTBOUND_SOCKETS
 struct sockaddr_in local;
#endif

 memset(&remote, 0, sizeof(remote));
 remote.sin_addr.s_addr = addr;
 remote.sin_port = htons((unsigned short)port);
Expand All@@ -820,6 +827,30 @@ int open_demux(
 return(-1);
 }

#ifdef BIND_OUTBOUND_SOCKETS
 /* Bind to the IP address associated with the hostname, in case there are
 * muliple possible source IPs for this destination.*/

 if (get_local_address(local) != PBSE_NONE)
 {
 sprintf(log_buffer, "could not determine local IP address: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

 if (bind(sock, (struct sockaddr *)&local, sizeof(local)))
 {
 sprintf(log_buffer, "could not bind local socket: %s", strerror(errno));
 log_err(errno, __func__, log_buffer);

 close(sock);
 return(-1);
 }

#endif

 for (i = 0;i < RETRY;i++)
 {
 if (connect(sock, (struct sockaddr *)&remote, sizeof(remote)) == 0)
Expand Down

26 changes: 26 additions & 0 deletions
src/test/net_common/test_uut.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,9 @@
#include <stdio.h>
#include <errno.h>
#include <poll.h>
#include <sys/socket.h>
#include <netdb.h>
#include <unistd.h>

#include "pbs_error.h"
#include "net_cache.h"
Expand DownExpand Up@@ -144,6 +147,25 @@ START_TEST(test_socket_wait_for_write)
 }
END_TEST

START_TEST(test_get_local_address)
 {
 int rc;
 struct sockaddr_in new_sockaddr;
 char hostname[NI_MAXHOST];
 char hbuf[NI_MAXHOST];

 gethostname(hostname, sizeof(hostname));

 rc = get_local_address(new_sockaddr);
 fail_unless(rc == PBSE_NONE);

 rc = getnameinfo((struct sockaddr*)&new_sockaddr, sizeof(new_sockaddr), hbuf, sizeof(hbuf), NULL, 0, 0);

 fail_unless(rc == 0);
 fail_unless(strncmp(hostname, hbuf, NI_MAXHOST) == 0);
 }
END_TEST

Suite *net_common_suite(void)
 {
 Suite *s = suite_create("net_common_suite methods");
Expand DownExpand Up@@ -171,6 +193,10 @@ Suite *net_common_suite(void)
 tcase_add_test(tc_core, test_socket_wait_for_write);
 suite_add_tcase(s, tc_core);

 tc_core = tcase_create("test_get_local_address");
 tcase_add_test(tc_core, test_get_local_address);
 suite_add_tcase(s, tc_core);

 return s;
 }

Expand Down