X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/bba846893ed2bb4d3591d9896c81619e4557e35c..bc5b5d78d5385d3eb285df1a400e92423129c794:/lib/mr_connect.c

diff --git a/lib/mr_connect.c b/lib/mr_connect.c
index ab0da959..e1d197e7 100644
--- a/lib/mr_connect.c
+++ b/lib/mr_connect.c
@@ -3,12 +3,12 @@
  *	$Author$
  *	$Header$
  *
- *	Copyright (C) 1987 by the Massachusetts Institute of Technology
+ *	Copyright (C) 1987, 1990 by the Massachusetts Institute of Technology
  *	For copying and distribution information, please see the file
  *	<mit-copyright.h>.
  *	
  * 	This routine is part of the client library.  It handles
- *	creating a connection to the sms server.
+ *	creating a connection to the mr server.
  */
 
 #ifndef lint
@@ -16,65 +16,111 @@ static char *rcsid_sms_connect_c = "$Header$";
 #endif lint
 
 #include <mit-copyright.h>
-#include "sms_private.h"
+#include "mr_private.h"
+#include <moira_site.h>
+#include <strings.h>
+
+static char *mr_server_host = 0;
 
 /*
- * Open a connection to the sms server.
+ * Open a connection to the mr server.  Looks for the server name
+ * 1) passed as an argument, 2) in environment variable, 3) by hesiod
+ * 4) compiled in default (from sms_app.h).
  */
 
-int sms_connect(server)
+int mr_connect(server)
 char *server;
 {
     extern int errno;
+    char *p, **pp, sbuf[256];
+    extern char *getenv(), **hes_resolve();
 	
-    if (!sms_inited) sms_init();
-    if (_sms_conn) return SMS_ALREADY_CONNECTED;
+    if (!mr_inited) mr_init();
+    if (_mr_conn) return MR_ALREADY_CONNECTED;
 		
-    /* 
-     * XXX should do a hesiod call to find the sms machine name & service
-     * number/name.
-     */
+    if (!server || (strlen(server) == 0)) {
+	server = getenv("MOIRASERVER");
+    }
+
+#ifdef HESIOD
+    if (!server || (strlen(server) == 0)) {
+	pp = hes_resolve("moira", "sloc");
+	if (pp) server = *pp;
+    }
+#endif HESIOD
+
+    if (!server || (strlen(server) == 0)) {
+	server = MOIRA_SERVER;
+    }
+
+    if (!index(server, ':')) {
+	p = index(MOIRA_SERVER, ':');
+	p++;
+	sprintf(sbuf, "%s:%s", server, p);
+	server = sbuf;
+    }
+
     errno = 0;
-    if (!server || (strlen(server) == 0))
-      server = SMS_GDB_SERV;
-    _sms_conn = start_server_connection(server, ""); 
-    if (_sms_conn == NULL)
+    _mr_conn = start_server_connection(server, ""); 
+    if (_mr_conn == NULL)
 	return errno;
-    if (connection_status(_sms_conn) == CON_STOPPED) {
-	register status = connection_errno(_sms_conn);
-	if (!status) status = SMS_CANT_CONNECT;
-	sms_disconnect();
+    if (connection_status(_mr_conn) == CON_STOPPED) {
+	register status = connection_errno(_mr_conn);
+	if (!status) status = MR_CANT_CONNECT;
+	mr_disconnect();
 	return status;
     }
+
+    /*
+     * stash hostname for later use
+     */
+
+    mr_server_host = strsave(server);
+    if (p = index(mr_server_host, ':'))
+	*p = 0;
+    mr_server_host = canonicalize_hostname(mr_server_host);
     return 0;
 }
 	
-int sms_disconnect()
+int mr_disconnect()
 {
     CHECK_CONNECTED;
-    _sms_conn = sever_connection(_sms_conn);
+    _mr_conn = sever_connection(_mr_conn);
+    free(mr_server_host);
+    mr_server_host = 0;
     return 0;
 }
 
-int sms_noop()
+int mr_host(host, size)
+  char *host;
+  int size;
+{
+    CHECK_CONNECTED;
+
+    /* If we are connected, mr_server_host points to a valid string. */
+    strncpy(host, mr_server_host, size);
+    return(0);
+}
+
+int mr_noop()
 {
     int status;
-    sms_params param_st;
-    struct sms_params *params = NULL;
-    struct sms_params *reply = NULL;
+    mr_params param_st;
+    struct mr_params *params = NULL;
+    struct mr_params *reply = NULL;
 
     CHECK_CONNECTED;
     params = &param_st;
-    params->sms_version_no = sending_version_no;
-    params->sms_procno = SMS_NOOP;
-    params->sms_argc = 0;
-    params->sms_argl = NULL;
-    params->sms_argv = NULL;
+    params->mr_version_no = sending_version_no;
+    params->mr_procno = MR_NOOP;
+    params->mr_argc = 0;
+    params->mr_argl = NULL;
+    params->mr_argv = NULL;
 	
-    if ((status = sms_do_call(params, &reply)) == 0)
-	status = reply->sms_status;
+    if ((status = mr_do_call(params, &reply)) == 0)
+	status = reply->mr_status;
 	
-    sms_destroy_reply(reply);
+    mr_destroy_reply(reply);
 
     return status;
 }