Changeset 733

Timestamp:

03/01/08 02:43:32 (6 months ago)

Author:

dsallings

Message:

Removed -B option. Protocol is always auto-discovered.

Files:

• branches/binary/server/memcached.c (modified) (3 diffs)
• branches/binary/server/memcached.h (modified) (1 diff)

branches/binary/server/memcached.c

@@ -3300 +3300 @@
-    printf("-p <num>      TCP port number to listen on (default: 11211)\n"
-           "-U <num>      UDP port number to listen on (default: 0, off)\n"
-           "-B <num>      binary protocol TCP port number to listen on (default: 0, off)\n"
-           "-s <file>     unix socket path to listen on (disables network support)\n"
-           "-a <mask>     access mask for unix socket, in octal (default 0700)\n"
@@ -3553 +3552 @@
-            settings.port = atoi(optarg);
-            break;
-        case 'B':
-            settings.binport = atoi(optarg);
-            break;
-        case 's':
-            settings.socketpath = optarg;
@@ -3790 +3786 @@
-        }
-
-        /* Try the binary port. */
-        if(settings.binport > 0) {
-            if(server_socket(settings.binport, binary_prot)) {
-                 fprintf(stderr, "failed to listen to binary protocol\n");
-                    exit(EXIT_FAILURE);
-            }
-        }
-        /*
-         * initialization order: first create the listening sockets

branches/binary/server/memcached.h

@@ -127 +127 @@
-    int port;
-    int udpport;
-    int binport;           /* Port for binary protocol. */
-    char *inter;
-    int verbose;