X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=lib%2Fexamples%2Fclient-blocking.c;h=f26cd6c401c3bd244578725909afa59aac542aca;hb=c1f196080a7cb867afd3dee50e2910899cbf5f46;hp=80d6cce0ff9b20f0e334554416d702e41ecc3e58;hpb=9e601f905d91f55c7a36f15fe5998d694c38444f;p=libradsec.git

diff --git a/lib/examples/client-blocking.c b/lib/examples/client-blocking.c
index 80d6cce..f26cd6c 100644
--- a/lib/examples/client-blocking.c
+++ b/lib/examples/client-blocking.c
@@ -4,91 +4,111 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <assert.h>
 #include <event2/event.h>
 #include <freeradius/libradius.h>
 #include <radsec/radsec.h>
 #include <radsec/request.h>
+#include "err.h"
+#include "debug.h"		/* For rs_dump_packet().  */
 
 #define SECRET "sikrit"
-#define USER_NAME "molgan"
+#define USER_NAME "molgan@PROJECT-MOONSHOT.ORG"
 #define USER_PW "password"
 
 struct rs_error *
-blocking_client (const char *av1, const char *av2, int use_request_object_flag)
+blocking_client (const char *config_fn, const char *configuration,
+                 int use_request_object_flag)
 {
-  struct rs_context *h;
-  struct rs_connection *conn;
-  struct rs_packet *req, *resp = NULL;
+  struct rs_context *h = NULL;
+  struct rs_connection *conn = NULL;
+  struct rs_request *request = NULL;
+  struct rs_packet *req = NULL, *resp = NULL;
+  struct rs_error *err = NULL;
 
-  if (rs_context_create (&h, "/usr/share/freeradius/dictionary"))
-    return NULL;
+  if (rs_context_create (&h))
+    {
+      err = err_create (RSE_INTERNAL, NULL, 0, "unable to create context");
+      assert (err != NULL);
+      return err;
+    }
 
 #if !defined (USE_CONFIG_FILE)
   {
     struct rs_peer *server;
 
+    if (rs_context_init_freeradius_dict (h, "/usr/share/freeradius/dictionary"))
+      goto cleanup;
     if (rs_conn_create (h, &conn, NULL))
-      return rs_err_conn_pop (conn);
+      goto cleanup;
     rs_conn_set_type (conn, RS_CONN_TYPE_UDP);
     if (rs_peer_create (conn, &server))
-      return rs_err_conn_pop (conn);
+      goto cleanup;
     if (rs_peer_set_address (server, av1, av2))
-      return rs_err_conn_pop (conn);
+      goto cleanup;
     rs_peer_set_timeout (server, 1);
     rs_peer_set_retries (server, 3);
     if (rs_peer_set_secret (server, SECRET))
-      return rs_err_conn_pop (conn);
+      goto cleanup;
   }
-#else
-  if (rs_context_read_config (h, av1))
-    return rs_err_ctx_pop (h);
-  if (rs_conn_create (h, &conn, av2))
-    return rs_err_conn_pop (conn);
-#endif	/* USE_CONFIG_FILE */
+#else  /* defined (USE_CONFIG_FILE) */
+  if (rs_context_read_config (h, config_fn))
+    goto cleanup;
+  if (rs_context_init_freeradius_dict (h, NULL))
+    goto cleanup;
+  if (rs_conn_create (h, &conn, configuration))
+    goto cleanup;
+#endif	/* defined (USE_CONFIG_FILE) */
 
   if (use_request_object_flag)
     {
-      struct rs_request *request;
-
-      if (rs_request_create (conn, &request, USER_NAME, USER_PW))
-	return rs_err_conn_pop (conn);
+      if (rs_request_create_authn (conn, &request, USER_NAME, USER_PW))
+	goto cleanup;
       if (rs_request_send (request, &resp))
-	return rs_err_conn_pop (conn);
-      rs_request_destroy (request);
+	goto cleanup;
     }
   else
     {
-      if (rs_packet_create_auth_request (conn, &req, USER_NAME, USER_PW))
-	return rs_err_conn_pop (conn);
-
+      if (rs_packet_create_authn_request (conn, &req, USER_NAME, USER_PW))
+	goto cleanup;
       if (rs_packet_send (req, NULL))
-	{
-	  rs_packet_destroy (req);
-	  return rs_err_conn_pop (conn);
-	}
+	goto cleanup;
       if (rs_conn_receive_packet (conn, req, &resp))
-	{
-	  rs_packet_destroy (req);
-	  return rs_err_conn_pop (conn);
-	}
-      rs_packet_destroy (req);
+	goto cleanup;
     }
 
   if (resp)
     {
-      RADIUS_PACKET *fr_pkt = NULL;
-      VALUE_PAIR *fr_vp = NULL;
-
-      fr_pkt = rs_packet_frpkt (resp);
-      fr_vp = fr_pkt->vps;	/* FIXME: Is there an accessor?  */
-      if (fr_vp)
-	vp_printlist(stdout, fr_vp);
-      rs_packet_destroy (resp);
+      rs_dump_packet (resp);
+      if (rs_packet_frpkt (resp)->code == PW_AUTHENTICATION_ACK)
+	printf ("Good auth.\n");
+      else
+	printf ("Bad auth: %d\n", rs_packet_frpkt (resp)->code);
     }
+  else
+    fprintf (stderr, "%s: no response\n", __func__);
 
-  rs_conn_destroy (conn);
-  rs_context_destroy (h);
-  return NULL;
+ cleanup:
+  err = rs_err_ctx_pop (h);
+  if (err == RSE_OK)
+    err = rs_err_conn_pop (conn);
+  if (resp)
+    rs_packet_destroy (resp);
+  if (request)
+    rs_request_destroy (request);
+  if (conn)
+    rs_conn_destroy (conn);
+  if (h)
+    rs_context_destroy (h);
+
+  return err;
+}
+
+void
+usage (int argc, char *argv[])
+{
+  fprintf (stderr, "usage: %s: [-r] config-file config-name\n", argv[0]);
+  exit (1);
 }
 
 int
@@ -103,10 +123,12 @@ main (int argc, char *argv[])
       argc--;
       argv++;
     }
+  if (argc < 3)
+    usage (argc, argv);
   err = blocking_client (argv[1], argv[2], use_request_object_flag);
   if (err)
     {
-      fprintf (stderr, "%s\n", rs_err_msg (err, 0));
+      fprintf (stderr, "%s\n", rs_err_msg (err));
       return rs_err_code (err, 1);
     }
   return 0;