Changeset 5375:2b4d1e027b2d in roaraudio for libroar/socket.c

Timestamp:

12/22/11 21:16:34 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

made some _LIBROAR_ATTR_TO_STATIC functions static

File:

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

libroar/socket.c

@@ -40 +40 @@
 #define MODE_CONNECT ROAR_SOCKET_MODE_CONNECT
 
+static int roar_socket_open_file  (int mode, const char * host, int port);
+static int roar_socket_open_proxy (int mode, int type, const char * host, int port, const char * proxy_type);
+
+static int roar_socket_open_socks4 (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts);
+static int roar_socket_open_socks4a(int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts);
+static int roar_socket_open_socks4d(int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts);
+static int roar_socket_open_socks4x(int mode, int fh, char host[4], int port, const char * app, size_t app_len, const char * user);
+
+static int roar_socket_open_http   (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts);
+
+static int roar_socket_open_ssh    (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts);
+
+
 #ifdef ROAR_TARGET_WIN32
 void roar_socket_win32_init (void) {
@@ -54 +67 @@
 #endif
 
-int roar_socket_decnet_set_timeout (int fh, time_t sec, int usec) {
+int roar_socket_decnet_set_timeout (int fh, time_t sec, int_least32_t usec) {
 #ifdef ROAR_HAVE_LIBDNET
  struct timeval timeout = {sec, usec};
@@ -64 +77 @@
 }
 
-int roar_socket_recvbuf(int fh, int len) {
-#ifdef ROAR_HAVE_BSDSOCKETS
- if ( len < 256 ) len = 256;
-
- return setsockopt(fh, SOL_SOCKET, SO_RCVBUF, (void *)&len, sizeof(len));
-#else
- return -1;
-#endif
-}
-
-int roar_socket_set_tos(int fh) {
+static int roar_socket_set_tos(int fh) {
 #if defined(ROAR_HAVE_BSDSOCKETS) && !defined(ROAR_TARGET_WIN32)
  int opt = IPTOS_LOWDELAY;
@@ -86 +89 @@
  return ret;
 #else
+ roar_err_set(ROAR_ERROR_NOSYS);
  return -1;
 #endif
@@ -387 +391 @@
 }
 
-int roar_socket_connect (const char * host, int port) {
+int roar_socket_connect (int type, const char * host, int port) {
  char * proxy_type = getenv("ROAR_PROXY");
 
@@ -393 +397 @@
 
  if ( proxy_type == NULL || strcmp(proxy_type, "") == 0 ) {
-  return roar_socket_open(MODE_CONNECT, ROAR_SOCKET_TYPE_UNKNOWN, host, port);
+  return roar_socket_open(MODE_CONNECT, type, host, port);
  } else {
 #ifdef ROAR_SUPPORT_PROXY
-  return roar_socket_open_proxy(MODE_CONNECT, ROAR_SOCKET_TYPE_UNKNOWN, host, port, proxy_type);
+  return roar_socket_open_proxy(MODE_CONNECT, type, host, port, proxy_type);
 #else
   ROAR_ERR("roar_socket_connect(host='%s', port=%i): no support for proxy code (proxy_type=%s)", host, port, proxy_type);
@@ -820 +824 @@
 }
 
-int roar_socket_open_file  (int mode, const char * host, int port) {
+static int roar_socket_open_file  (int mode, const char * host, int port) {
 #ifdef ROAR_HAVE_IO_POSIX
  int fh;
@@ -848 +852 @@
 
 #ifdef ROAR_SUPPORT_PROXY
-int roar_socket_open_proxy (int mode, int type, const char * host, int port, const char * proxy_type) {
+static int roar_socket_open_proxy (int mode, int type, const char * host, int port, const char * proxy_type) {
  int    proxy_port = -1;
  char   proxy_host[ROAR_SOCKET_MAX_HOSTNAMELEN];
@@ -975 +979 @@
 // protocoll dependet proxy code:
 
-int roar_socket_open_socks4 (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) {
+static int roar_socket_open_socks4 (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) {
 #ifndef ROAR_TARGET_MICROCONTROLLER
  struct hostent     * he;
@@ -990 +994 @@
 }
 
-int roar_socket_open_socks4a(int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) {
+static int roar_socket_open_socks4a(int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) {
  return roar_socket_open_socks4x(mode, fh, "\0\0\0\1", port, host, strlen(host)+1, user);
 }
 
-int roar_socket_open_socks4d(int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) {
+static int roar_socket_open_socks4d(int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) {
  size_t len = strlen(host)+1;
  char * dp;
@@ -1010 +1014 @@
 }
 
-int roar_socket_open_socks4x(int mode, int fh, char host[4], int port, const char * app, size_t app_len, const char * user) {
+static int roar_socket_open_socks4x(int mode, int fh, char host[4], int port, const char * app, size_t app_len, const char * user) {
  char buf[9];
  int len;
@@ -1048 +1052 @@
 }
 
-int roar_socket_open_http   (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) {
+static int roar_socket_open_http   (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) {
  char buf[1024];
  int len;
@@ -1081 +1085 @@
 
 #ifdef ROAR_HAVE_BIN_SSH
-int roar_socket_open_ssh    (int mode, int fh, const char * host, int port, const char * user, const char * pw, const char * opts) {
+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");
  char * sep;