Changeset 1037 for pjproject/trunk/pjlib-util/src/pjstun-srv-test/server_main.c

Timestamp:

Mar 3, 2007 2:16:36 AM (18 years ago)

Author:

bennylp

Message:

Committed today's work on STUN

File:

• pjproject/trunk/pjlib-util/src/pjstun-srv-test/server_main.c (modified) (6 diffs)

pjproject/trunk/pjlib-util/src/pjstun-srv-test/server_main.c

@@ -62 +62 @@
     pj_thread_t         *threads[16];
 
+
 } server;
 
+static struct options
+{
+    char        *realm;
+    char        *user_name;
+    char        *password;
+    char        *nonce;
+    pj_bool_t    use_fingerprint;
+} o;
 
 static pj_status_t server_perror(const char *sender, const char *title, 
@@ -132 +141 @@
 
     /* Create MAPPED-ADDRESS attribute */
-    status = pj_stun_msg_add_generic_ip_addr_attr(tdata->pool, tdata->msg,
-                                                  PJ_STUN_ATTR_MAPPED_ADDR,
-                                                  PJ_FALSE,
-                                                  src_addr, src_addr_len);
+    status = pj_stun_msg_add_ip_addr_attr(tdata->pool, tdata->msg,
+                                          PJ_STUN_ATTR_MAPPED_ADDR,
+                                          PJ_FALSE,
+                                          src_addr, src_addr_len);
     if (status != PJ_SUCCESS) {
         server_perror(THIS_FILE, "Error creating response", status);
@@ -145 +154 @@
     if (msg->hdr.magic == PJ_STUN_MAGIC) {
         status = 
-            pj_stun_msg_add_generic_ip_addr_attr(tdata->pool, tdata->msg,
-                                                 PJ_STUN_ATTR_XOR_MAPPED_ADDRESS,
-                                                 PJ_TRUE,
-                                                 src_addr, src_addr_len);
+            pj_stun_msg_add_ip_addr_attr(tdata->pool, tdata->msg,
+                                         PJ_STUN_ATTR_XOR_MAPPED_ADDRESS,
+                                         PJ_TRUE,
+                                         src_addr, src_addr_len);
         if (status != PJ_SUCCESS) {
             server_perror(THIS_FILE, "Error creating response", status);
@@ -157 +166 @@
 
     /* Send */
-    status = pj_stun_session_send_msg(sess, PJ_STUN_CACHE_RESPONSE, 
+    status = pj_stun_session_send_msg(sess, PJ_TRUE, 
                                       src_addr, src_addr_len, tdata);
     return status;
@@ -264 +273 @@
     sess_cb.on_rx_request = &on_rx_request;
     status = pj_stun_session_create(server.endpt, "session", 
-                                    &sess_cb, &svc->sess);
+                                    &sess_cb, 
+                                    o.use_fingerprint!=0, 
+                                    &svc->sess);
     if (status != PJ_SUCCESS)
         goto on_error;
 
     pj_stun_session_set_user_data(svc->sess, (void*)svc);
+
+    if (o.user_name) {
+        pj_stun_auth_cred cred;
+
+        pj_bzero(&cred, sizeof(cred));
+
+        cred.type = PJ_STUN_AUTH_CRED_STATIC;
+        cred.data.static_cred.realm = pj_str(o.realm);
+        cred.data.static_cred.username = pj_str(o.user_name);
+        cred.data.static_cred.data_type = 0;
+        cred.data.static_cred.data = pj_str(o.password);
+        cred.data.static_cred.nonce = pj_str(o.nonce);
+
+        pj_stun_session_set_credential(svc->sess, &cred);
+        puts("Session credential set");
+    } else {
+        puts("Credential not set");
+    }
 
     pj_bzero(&service_callback, sizeof(service_callback));
@@ -438 +467 @@
 
 
-int main()
-{
+static void usage(void)
+{
+    puts("Usage: pjstun_srv_test [OPTIONS]");
+    puts("");
+    puts("where OPTIONS:");
+    puts(" --realm, -r       Set realm of the credential");
+    puts(" --username, -u    Set username of the credential");
+    puts(" --password, -p    Set password of the credential");
+    puts(" --nonce, -N       Set NONCE");      
+    puts(" --fingerprint, -F Use fingerprint for outgoing requests");
+    puts(" --help, -h");
+}
+
+
+int main(int argc, char *argv[])
+{
+    struct pj_getopt_option long_options[] = {
+        { "realm",      1, 0, 'r'},
+        { "username",   1, 0, 'u'},
+        { "password",   1, 0, 'p'},
+        { "nonce",      1, 0, 'N'},
+        { "fingerprint",0, 0, 'F'},
+        { "help",       0, 0, 'h'}
+    };
+    int c, opt_id;
+
+    while((c=pj_getopt_long(argc,argv, "r:u:p:hF", long_options, &opt_id))!=-1) {
+        switch (c) {
+        case 'r':
+            o.realm = pj_optarg;
+            break;
+        case 'u':
+            o.user_name = pj_optarg;
+            break;
+        case 'p':
+            o.password = pj_optarg;
+            break;
+        case 'N':
+            o.nonce = pj_optarg;
+            break;
+        case 'h':
+            usage();
+            return 0;
+        case 'F':
+            o.use_fingerprint = PJ_TRUE;
+            break;
+        default:
+            printf("Argument \"%s\" is not valid. Use -h to see help",
+                   argv[pj_optind]);
+            return 1;
+        }
+    }
+
+    if (pj_optind != argc) {
+        puts("Error: invalid arguments");
+        return 1;
+    }
+
+
     if (server_init()) {
         server_destroy();