Changeset 31e48a3 for zephyr.c

Timestamp:

Jun 1, 2003, 2:42:58 PM (20 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

df0d93a

Parents:

0ff8fb57

Message:

Do ZResetAuthentication() before zlog_in and zlog_out as well

File:

• zephyr.c (modified) (19 diffs)

zephyr.c

@@ -12 +12 @@
 Code_t ZResetAuthentication();
 
-int owl_zephyr_loadsubs(char *filename) {
+int owl_zephyr_loadsubs(char *filename)
+{
   /* return 0  on success
    *        -1 on file error
@@ -84 +85 @@
 }
 
-int owl_zephyr_loadloginsubs(char *filename) {
+int owl_zephyr_loadloginsubs(char *filename)
+{
   FILE *file;
   ZSubscription_t subs[3001];
@@ -139 +141 @@
 }
 
-void unsuball() {
+void unsuball()
+{
   int ret;
 
@@ -149 +152 @@
 }
 
-int owl_zephyr_sub(char *class, char *inst, char *recip) {
+int owl_zephyr_sub(char *class, char *inst, char *recip)
+{
   ZSubscription_t subs[5];
   int ret;
@@ -166 +170 @@
 
 
-int owl_zephyr_unsub(char *class, char *inst, char *recip) {
+int owl_zephyr_unsub(char *class, char *inst, char *recip)
+{
   ZSubscription_t subs[5];
   int ret;
@@ -183 +188 @@
 
 
-char *owl_zephyr_get_field(ZNotice_t *n, int j, int *k) {
+char *owl_zephyr_get_field(ZNotice_t *n, int j, int *k)
+{
   /* return a pointer to the Jth field, place the length in k.  If the
      field doesn't exist return an emtpy string */
@@ -212 +218 @@
 
 
-int owl_zephyr_get_num_fields(ZNotice_t *n) {
+int owl_zephyr_get_num_fields(ZNotice_t *n)
+{
   int i, fields;
 
@@ -224 +231 @@
 
 
-char *owl_zephyr_get_message(ZNotice_t *n, int *k) {
+char *owl_zephyr_get_message(ZNotice_t *n, int *k)
+{
   /* return a pointer to the message, place the message length in k */
   if (!strcasecmp(n->z_opcode, "ping")) {
@@ -235 +243 @@
 
 
-char *owl_zephyr_get_zsig(ZNotice_t *n, int *k) {
+char *owl_zephyr_get_zsig(ZNotice_t *n, int *k)
+{
   /* return a pointer to the zsig if there is one */
 
@@ -247 +256 @@
 
 
-int send_zephyr(char *opcode, char *zsig, char *class, char *instance, char *recipient, char *message) {
+int send_zephyr(char *opcode, char *zsig, char *class, char *instance, char *recipient, char *message)
+{
   int ret;
   ZNotice_t notice;
@@ -287 +297 @@
 }
 
-Code_t send_zephyr_helper(ZNotice_t *notice, char *buf, int len, int wait) {
+Code_t send_zephyr_helper(ZNotice_t *notice, char *buf, int len, int wait)
+{
   return(ZSendPacket(buf, len, 0));
 }
 
-void send_ping(char *to) {
+void send_ping(char *to)
+{
   send_zephyr("PING", "", "MESSAGE", "PERSONAL", to, "");
 }
 
-void owl_zephyr_handle_ack(ZNotice_t *retnotice) {
+void owl_zephyr_handle_ack(ZNotice_t *retnotice)
+{
   char *tmp;
   
@@ -331 +344 @@
 }
 
-int owl_zephyr_notice_is_ack(ZNotice_t *n) {
+int owl_zephyr_notice_is_ack(ZNotice_t *n)
+{
   if (n->z_kind == SERVNAK || n->z_kind == SERVACK || n->z_kind == HMACK) {
     if (!strcasecmp(n->z_class, LOGIN_CLASS)) return(0);
@@ -339 +353 @@
 }
   
-void owl_zephyr_zaway(owl_message *m) {
+void owl_zephyr_zaway(owl_message *m)
+{
   char *tmpbuff, *myuser, *to;
   
@@ -380 +395 @@
 
 
-void owl_zephyr_hackaway_cr(ZNotice_t *n) {
+void owl_zephyr_hackaway_cr(ZNotice_t *n)
+{
   /* replace \r's with ' '.  Gross-ish */
   int i;
@@ -391 +407 @@
 }
 
-void owl_zephyr_zlocate(char *user, char *out, int auth) {
+void owl_zephyr_zlocate(char *user, char *out, int auth)
+{
   int ret, numlocs;
   int one = 1;
@@ -419 +436 @@
 }
 
-void owl_zephyr_addsub(char *filename, char *class, char *inst, char *recip) {
+void owl_zephyr_addsub(char *filename, char *class, char *inst, char *recip)
+{
   char *line, subsfile[LINE], buff[LINE];
   FILE *file;
@@ -461 +479 @@
 }
 
-void owl_zephyr_delsub(char *filename, char *class, char *inst, char *recip) {
+void owl_zephyr_delsub(char *filename, char *class, char *inst, char *recip)
+{
   char *line, subsfile[LINE], buff[LINE], *text;
   char backupfilename[LINE];
@@ -527 +546 @@
 }
 
-char *owl_zephyr_makesubline(char *class, char *inst, char *recip) {
+char *owl_zephyr_makesubline(char *class, char *inst, char *recip)
+{
   /* caller must free the return */
   char *out;
@@ -535 +555 @@
   return(out);
 }
+
+
+void owl_zephyr_zlog_in(void)
+{
+  char *exposure, *eset;
+  int ret;
+
+  ZResetAuthentication();
+    
+  eset=EXPOSE_REALMVIS;
+  exposure=ZGetVariable("exposure");
+  if (exposure==NULL) {
+    eset=EXPOSE_REALMVIS;
+  } else if (!strcasecmp(exposure,EXPOSE_NONE)) {
+    eset = EXPOSE_NONE;
+  } else if (!strcasecmp(exposure,EXPOSE_OPSTAFF)) {
+    eset = EXPOSE_OPSTAFF;
+  } else if (!strcasecmp(exposure,EXPOSE_REALMVIS)) {
+    eset = EXPOSE_REALMVIS;
+  } else if (!strcasecmp(exposure,EXPOSE_REALMANN)) {
+    eset = EXPOSE_REALMANN;
+  } else if (!strcasecmp(exposure,EXPOSE_NETVIS)) {
+    eset = EXPOSE_NETVIS;
+  } else if (!strcasecmp(exposure,EXPOSE_NETANN)) {
+    eset = EXPOSE_NETANN;
+  }
+   
+  ret=ZSetLocation(eset);
+  if (ret != ZERR_NONE) {
+    /*
+      char buff[LINE];
+      sprintf(buff, "Error setting location: %s", error_message(ret));
+      owl_function_makemsg(buff);
+    */
+  }
+}
+
+void owl_zephyr_zlog_out(void)
+{
+  int ret;
+
+  ZResetAuthentication();
+  ret=ZUnsetLocation();
+  if (ret != ZERR_NONE) {
+    /*
+      char buff[LINE];
+      sprintf(buff, "Error unsetting location: %s", error_message(ret));
+      owl_function_makemsg(buff);
+    */
+  }
+}
+