X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=lib%2Fexamples%2Fclient-blocking.c;h=1b77de3c91d8b2adb769aa587169c1d0c45f56ec;hb=5b117878698519e798f928cef18eafc9dad4c15a;hp=9a211c81af3fb9c33b440aa569deba837995238f;hpb=63a5bc0182881d8f806a9acdf47b708492b8a41b;p=libradsec.git

diff --git a/lib/examples/client-blocking.c b/lib/examples/client-blocking.c
index 9a211c8..1b77de3 100644
--- a/lib/examples/client-blocking.c
+++ b/lib/examples/client-blocking.c
@@ -4,82 +4,128 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <assert.h>
 #include <event2/event.h>
-#include <freeradius/libradius.h>
 #include <radsec/radsec.h>
-#if defined(USE_REQUEST_OBJECT)
+#include <radsec/radsec-impl.h>
 #include <radsec/request.h>
-#endif
+#include "err.h"
+#include "debug.h"		/* For rs_dump_packet().  */
 
 #define SECRET "sikrit"
-#define USER_NAME "bob"
-#define USER_PW "hemligt"
+#define USER_NAME "molgan@PROJECT-MOONSHOT.ORG"
+#define USER_PW "password"
 
 struct rs_error *
-blocking_client (const char *srvname, int srvport)
+blocking_client (const char *config_fn, const char *configuration,
+                 int use_request_object_flag)
 {
-  struct rs_handle *h;
-  struct rs_connection *conn;
-  struct rs_peer *server;
-  struct rs_packet *req, *resp;
-  RADIUS_PACKET *fr_pkt;
-  VALUE_PAIR *fr_vp;
+  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;
+  int r;
 
-  if (rs_context_create (&h, "/usr/share/freeradius/dictionary"))
-    return NULL;
+  r = rs_context_create (&h);
+  if (r)
+    {
+      assert(r == RSE_NOMEM);
+      assert (!"out of RAM -- unable to create libradsec context");
+    }
 
-  if (rs_conn_create (h, &conn))
-    return rs_err_conn_pop (conn);
-  if (rs_conn_add_server (conn, &server, RS_CONN_TYPE_UDP, srvname, srvport))
-    return rs_err_conn_pop (conn);
-  rs_server_set_timeout (server, 1);
-  rs_server_set_tries (server, 3);
-  rs_server_set_secret (server, SECRET);
+#if !defined (USE_CONFIG_FILE)
+  {
+    struct rs_peer *server;
 
-  if (rs_packet_create_acc_request (conn, &req, USER_NAME, USER_PW))
-    return rs_err_conn_pop (conn);
+    if (rs_conn_create (h, &conn, NULL))
+      goto cleanup;
+    rs_conn_set_type (conn, RS_CONN_TYPE_UDP);
+    if (rs_peer_create (conn, &server))
+      goto cleanup;
+    if (rs_peer_set_address (server, av1, av2))
+      goto cleanup;
+    rs_peer_set_timeout (server, 1);
+    rs_peer_set_retries (server, 3);
+    if (rs_peer_set_secret (server, SECRET))
+      goto cleanup;
+  }
+#else  /* defined (USE_CONFIG_FILE) */
+  if (rs_context_read_config (h, config_fn))
+    goto cleanup;
+  if (rs_conn_create (h, &conn, configuration))
+    goto cleanup;
+#endif	/* defined (USE_CONFIG_FILE) */
 
-#if !defined(USE_REQUEST_OBJECT)
-  if (rs_packet_send (req, NULL))
-    return rs_err_conn_pop (conn);
-  req = NULL;
-  if (rs_conn_receive_packet (conn, &resp))
-    return rs_err_conn_pop (conn);
-#else
-  {
-    struct rs_request *request;
+  if (use_request_object_flag)
+    {
+      if (rs_request_create_authn (conn, &request, USER_NAME, USER_PW))
+	goto cleanup;
+      if (rs_request_send (request, &resp))
+	goto cleanup;
+    }
+  else
+    {
+      if (rs_packet_create_authn_request (conn, &req, USER_NAME, USER_PW))
+	goto cleanup;
+      if (rs_packet_send (req, NULL))
+	goto cleanup;
+      if (rs_conn_receive_packet (conn, req, &resp))
+	goto cleanup;
+    }
 
-    if (rs_request_new (conn, &request))
-      return rs_err_conn_pop (conn);
-    if (rs_req_send (request, req, &resp))
-      return rs_err_conn_pop (conn);
+  if (resp)
+    {
+      rs_dump_packet (resp);
+      if (rs_packet_code (resp) == PW_ACCESS_ACCEPT)
+	printf ("Good auth.\n");
+      else
+	printf ("Bad auth: %d\n", rs_packet_code (resp));
+    }
+  else
+    fprintf (stderr, "%s: no response\n", __func__);
+
+ 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);
-  }
-#endif /* !defined(USE_REQUEST_OBJECT) */
+  if (conn)
+    rs_conn_destroy (conn);
+  if (h)
+    rs_context_destroy (h);
 
-  fr_pkt = rs_packet_frpkt (resp);
-  fr_vp = fr_pkt->vps;		/* FIXME: Is there an accessor?  */
-  vp_printlist(stdout, fr_vp);
-  rs_packet_destroy (resp);
+  return err;
+}
 
-  rs_conn_destroy (conn);
-  rs_context_destroy (h);
-  return NULL;
+void
+usage (int argc, char *argv[])
+{
+  fprintf (stderr, "usage: %s: [-r] config-file config-name\n", argv[0]);
+  exit (1);
 }
 
 int
 main (int argc, char *argv[])
 {
+  int use_request_object_flag = 0;
   struct rs_error *err;
-  char *host;
-  int port;
 
-  host = strsep (argv + 1, ":");
-  port = atoi (argv[1]);
-  err = blocking_client (host, port);
+  if (argc > 1 && argv[1] && argv[1][0] == '-' && argv[1][1] == 'r')
+    {
+      use_request_object_flag = 1;
+      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, "error: %s: %d\n", rs_err_msg (err), rs_err_code (err, 0));
       return rs_err_code (err, 1);
     }
   return 0;