X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finclude%2Fctdl_module.h;h=1f5c8fcfb4c1bf25eea6d9d2a8418f760552be2d;hb=e329db30593524cc2d8851a4500bac41f2340354;hp=ccd01c8313cae998a20f54543e5a602876be4502;hpb=dec3606868b9f659eef33f5e84e3ba1642cd9039;p=citadel.git

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index ccd01c831..1f5c8fcfb 100644
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -65,22 +65,6 @@
 		FMT_CITADEL,			\
 		SUBJECT) 
 
-
-#define CtdlAideFPMessage(TEXT, SUBJECT, N, STR, STRLEN, ccid, ioid, TIME) \
-	flood_protect_quickie_message(			 \
-		"Citadel",				 \
-		NULL,					 \
-		NULL,					 \
-		AIDEROOM,				 \
-		TEXT,					 \
-		FMT_CITADEL,				 \
-		SUBJECT,				 \
-		N,					 \
-		STR,					 \
-		STRLEN,					 \
-		ccid,					 \
-		ioid,					 \
-		TIME)
 /*
  * Hook functions available to modules.
  */
@@ -109,8 +93,6 @@
 #define PRIO_UNSTEALTH 45000
 /* Priorities for EVT_STEALTH */
 #define PRIO_STEALTH 50000
-void CtdlRegisterTDAPVetoHook(int (*fcn_ptr)(StrBuf*), int EventType, int Priority);
-void CtdlUnregisterTDAPVetoHook(int (*fcn_ptr) (StrBuf*), int EventType);
 
 
 void CtdlRegisterSessionHook(void (*fcn_ptr)(void), int EventType, int Priority);
@@ -247,6 +229,7 @@ void CtdlPutRoomLock(struct ctdlroom *qrbuf);
 typedef void (*ForEachRoomCallBack)(struct ctdlroom *EachRoom, void *out_data);
 void CtdlForEachRoom(ForEachRoomCallBack CB, void *in_data);
 typedef void (*ForEachRoomNetCfgCallBack)(struct ctdlroom *EachRoom, void *out_data, OneRoomNetCfg *OneRNCFG);
+char *LoadRoomNetConfigFile(long roomnum);
 void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, void *in_data);
 void SaveChangedConfigs(void);
 void CtdlDeleteRoom(struct ctdlroom *qrbuf);
@@ -374,26 +357,9 @@ typedef struct __NetMap {
 
 HashList* CtdlReadNetworkMap(void);
 StrBuf *CtdlSerializeNetworkMap(HashList *Map);
-void NetworkLearnTopology(char *node, char *path, HashList *the_netmap, int *netmap_changed);
-int CtdlIsValidNode(const StrBuf **nexthop,
-		    const StrBuf **secret,
-		    StrBuf *node,
-		    HashList *IgnetCfg,
-		    HashList *the_netmap);
-
 
 
 
-int CtdlNetworkTalkingTo(const char *nodename, long len, int operation);
-
-/*
- * Operations that can be performed by network_talking_to()
- */
-enum {
-        NTT_ADD,
-        NTT_REMOVE,
-        NTT_CHECK
-};
 
 /*
  * Expose API calls from user_ops.c
@@ -403,20 +369,13 @@ int CtdlGetUserLen(struct ctdluser *usbuf, const char *name, long len);
 int CtdlGetUserLock(struct ctdluser *usbuf, char *name);
 void CtdlPutUser(struct ctdluser *usbuf);
 void CtdlPutUserLock(struct ctdluser *usbuf);
-
 int CtdlLockGetCurrentUser(void);
 void CtdlPutCurrentUserLock(void);
-
 int CtdlGetUserByNumber(struct ctdluser *usbuf, long number);
-void CtdlGetRelationship(visit *vbuf,
-                        struct ctdluser *rel_user,
-                        struct ctdlroom *rel_room);
-void CtdlSetRelationship(visit *newvisit,
-                        struct ctdluser *rel_user,
-                        struct ctdlroom *rel_room);
+void CtdlGetRelationship(visit *vbuf, struct ctdluser *rel_user, struct ctdlroom *rel_room);
+void CtdlSetRelationship(visit *newvisit, struct ctdluser *rel_user, struct ctdlroom *rel_room);
 void CtdlMailboxName(char *buf, size_t n, const struct ctdluser *who, const char *prefix);
-
-int CtdlLoginExistingUser(char *authname, const char *username);
+int CtdlLoginExistingUser(const char *username);
 
 /*
  * Values which may be returned by CtdlLoginExistingUser()
@@ -442,20 +401,20 @@ enum {
 
 void CtdlUserLogout(void);
 
-
-
-
 /*
  * Expose API calls from msgbase.c
  */
 
 
-
 /*
  * Expose API calls from euidindex.c
  */
 long CtdlLocateMessageByEuid(char *euid, struct ctdlroom *qrbuf);
 
 
+/*
+ * Expose API calls from modules/openid/serv_openid_rp.c in order to turn it into a generic external authentication driver
+ */
+int attach_extauth(struct ctdluser *who, StrBuf *claimed_id);
 
 #endif /* CTDL_MODULE_H */