Changeset 5754:b23d79c13370 in roaraudio for libroar/socket.c

Timestamp:

11/16/12 16:49:56 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

avoid getenv() and use more portable roar_env_get(). Also improved security as we enfore const now on bufferes obtained from the env.

File:

• libroar/socket.c (modified) (7 diffs)

libroar/socket.c

@@ -401 +401 @@
 
 int roar_socket_connect (int type, const char * host, int port) {
- char * proxy_type = getenv("ROAR_PROXY");
+ const char * proxy_type = roar_env_get("ROAR_PROXY");
 
  ROAR_DBG("roar_socket_connect(host='%s', port=%i) = ?", host, port);
@@ -874 +874 @@
  int    proxy_port = -1;
  char   proxy_host[ROAR_SOCKET_MAX_HOSTNAMELEN];
- char * proxy_addr = NULL;
+ const char * proxy_addr = NULL;
  int    i;
  int    fh = -1;
- char * user = NULL, * pw = NULL, * opts = NULL;
+ const char * user = NULL, * pw = NULL, * opts = NULL;
  char * sep;
  int    no_fh = 0;
@@ -895 +895 @@
 
  if ( user == NULL )
-  user = getenv("USER");
+  user = roar_env_get("USER");
 
  // TODO: change this so we support listen() proxys (ssh -R)
@@ -902 +902 @@
 
  if ( !strncmp(proxy_type, "socks", 5) ) {
-  proxy_addr = getenv("socks_proxy");
+  proxy_addr = roar_env_get("socks_proxy");
 
   proxy_port = 9050; // TOR's default port
@@ -908 +908 @@
   proxy_port = 8080;
 
-  if ( (proxy_addr = getenv("http_proxy")) == NULL )
-   proxy_addr = getenv("https_proxy");
+  if ( (proxy_addr = roar_env_get("http_proxy")) == NULL )
+   proxy_addr = roar_env_get("https_proxy");
 
   if ( proxy_addr == NULL )
@@ -918 +918 @@
  } else if ( !strncmp(proxy_type, "ssh", 3) ) {
   proxy_port = 22;
-  proxy_addr = getenv("ssh_proxy");
+  proxy_addr = roar_env_get("ssh_proxy");
   no_fh      = 1;
  }
@@ -1105 +1105 @@
 #ifdef ROAR_HAVE_BIN_SSH
 static int roar_socket_open_ssh    (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) {
- char * proxy_addr = getenv("ssh_proxy");
+ const char * proxy_addr = roar_env_get("ssh_proxy");
  char * sep;
  char   cmd[1024] = {0}, rcmd[1024] = {0};