One more field in the xml-vcard

[citadel.git] / citadel / modules / xmpp / serv_xmpp.h

diff --git a/citadel/modules/xmpp/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h
index c3281a5c486e21fe6039cfca737b2e234a9fbb33..c49142758e2a260f7cf0eac8bb99aa85019aecc0 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.h
+++ b/citadel/modules/xmpp/serv_xmpp.h
@@ -1,22 +1,16 @@
 /*
- * Copyright (c) 2007-2009 by Art Cancro
+ * Copyright (c) 2007-2019 by the citadel.org team
  *
- *  This program is open source software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3.
- *  
- *  
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  
- *  
- *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
-typedef struct _citxmpp {                      /* Information about the current session */
+typedef struct _citxmpp {              /* Information about the current session */
        XML_Parser xp;                  /* XML parser instance for incoming client stream */
        char server_name[256];          /* who they think we are */
        char *chardata;
@@ -33,6 +27,7 @@ typedef struct _citxmpp {                     /* Information about the current session */
        char iq_client_password[256];   /* password requested by the client (NON SASL ONLY) */
        char iq_client_resource[256];   /* resource name requested by the client */
        int iq_session;                 /* nonzero == client is requesting a session */
+       int iq_vcard;                   /* nonzero == client is requesting its vCard */
        char iq_query_xmlns[256];       /* Namespace of <query> */
 
        char sasl_auth_mech[32];        /* SASL auth mechanism requested by the client */
@@ -78,21 +73,8 @@ void xmpp_process_events(void);
 void xmpp_presence_notify(char *, int);
 void xmpp_roster_item(struct CitContext *);
 void xmpp_send_message(char *, char *);
-void xmpp_non_sasl_authenticate(char *, char *, char *, char *);
+void xmpp_non_sasl_authenticate(char *, char *, char *);
 void xmpp_massacre_roster(void);
 void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void);
 int xmpp_is_visible(struct CitContext *from, struct CitContext *to_whom);
 char *xmlesc(char *buf, char *str, int bufsiz);
-
-extern int XMPPSrvDebugEnable;
-
-#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (XMPPSrvDebugEnable != 0))
-
-#define XMPP_syslog(LEVEL, FORMAT, ...)                                \
-       DBGLOG(LEVEL) syslog(LEVEL,                             \
-                            "XMPP: " FORMAT, __VA_ARGS__)
-
-#define XMPPM_syslog(LEVEL, FORMAT)            \
-       DBGLOG(LEVEL) syslog(LEVEL,             \
-                            "XMPP: " FORMAT);
-