Changeset 834:3c740aeb58c5 in roaraudio for libroar/socket.c

Timestamp:

09/27/08 02:17:23 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added new arguemnts proxy funcs

File:

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

libroar/socket.c

@@ -599 +599 @@
  int    i;
  int    fh = -1;
- int (* code)(int mode, int fh, char * host, int port) = NULL;
+ int (* code)(int mode, int fh, char * host, int port, char * user, char * pw, char * opts) = NULL;
 
  // TODO: change this so we support listen() proxys (ssh -R)
@@ -652 +652 @@
 
  if ( code != NULL ) {
-  if ( code(mode, fh, host, port) == -1 ) {
+  if ( code(mode, fh, host, port, NULL, NULL, NULL) == -1 ) {
    close(fh);
    return -1;
@@ -666 +666 @@
 // protocoll dependet proxy code:
 
-int roar_socket_open_socks4 (int mode, int fh, char * host, int port) {
+int roar_socket_open_socks4 (int mode, int fh, char * host, int port, char * user, char * pw, char * opts) {
  struct hostent     * he;
 
@@ -674 +674 @@
  }
 
- return roar_socket_open_socks4x(mode, fh, he->h_addr, port, NULL, 0);
-}
-
-int roar_socket_open_socks4a(int mode, int fh, char * host, int port) {
- return roar_socket_open_socks4x(mode, fh, "\0\0\0\1", port, host, strlen(host)+1);
-}
-
-int roar_socket_open_socks4d(int mode, int fh, char * host, int port) {
+ return roar_socket_open_socks4x(mode, fh, he->h_addr, port, NULL, 0, user);
+}
+
+int roar_socket_open_socks4a(int mode, int fh, char * host, int port, char * user, char * pw, 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, char * host, int port, char * user, char * pw, char * opts) {
  size_t len = strlen(host)+1;
  char * dp;
@@ -694 +694 @@
  }
 
- return roar_socket_open_socks4x(mode, fh, "\0\2\0\0", port, host, len);
-}
-
-int roar_socket_open_socks4x(int mode, int fh, char host[4], int port, char * app, size_t app_len) {
+ return roar_socket_open_socks4x(mode, fh, "\0\2\0\0", port, host, len, user);
+}
+
+int roar_socket_open_socks4x(int mode, int fh, char host[4], int port, char * app, size_t app_len, char * user) {
  char buf[9];
 
@@ -722 +722 @@
 }
 
-int roar_socket_open_http   (int mode, int fh, char * host, int port) {
+int roar_socket_open_http   (int mode, int fh, char * host, int port, char * user, char * pw, char * opts) {
  char buf[1024];
  int len;