fix two memory leaks

[catta] / flx.h

diff --git a/flx.h b/flx.h
index 8c46673e0d990c8338f36edafcd4e306f68ec1e7..e641a850afa646307fb2ea4e9fb159ba07d48f12 100644 (file)
--- a/flx.h
+++ b/flx.h
@@ -4,58 +4,119 @@
 #include <stdio.h>
 #include <glib.h>
 
-struct _flxServer;
 typedef struct _flxServer flxServer;
+typedef struct _flxEntry flxEntry;
+typedef struct _flxEntryGroup flxEntryGroup;
 
-typedef struct  {
-    gchar *name;
-    guint16 type;
-    guint16 class;
-    gpointer data;
-    guint16 size;
-    guint32 ttl;
-} flxRecord;
-
-typedef struct {
-    gchar *name;
-    guint16 type;
-    guint16 class;
-} flxQuery;
+#include "address.h"
+#include "rr.h"
 
-flxServer *flx_server_new(GMainContext *c);
-void flx_server_free(flxServer* s);
-
-gint flx_server_get_next_id(flxServer *s);
+typedef enum {
+    FLX_ENTRY_NULL = 0,
+    FLX_ENTRY_UNIQUE = 1,
+    FLX_ENTRY_NOPROBE = 2,
+    FLX_ENTRY_NOANNOUNCE = 4
+} flxEntryFlags;
 
-void flx_server_add_rr(flxServer *s, gint id, gint interface, const flxRecord *rr);
-void flx_server_add(flxServer *s, gint id, const gchar *name, gint interface, guint16 type, gconstpointer data, guint size);
+typedef enum {
+    FLX_ENTRY_GROUP_UNCOMMITED,
+    FLX_ENTRY_GROUP_REGISTERING,
+    FLX_ENTRY_GROUP_ESTABLISHED,
+    FLX_ENTRY_GROUP_COLLISION
+} flxEntryGroupStatus;
 
-void flx_server_remove(flxServer *s, gint id);
+typedef void (*flxEntryGroupCallback) (flxServer *s, flxEntryGroup *g, flxEntryGroupStatus status, gpointer userdata);
 
-const flxRecord *flx_server_iterate(flxServer *s, gint id, void **state);
-
-flxRecord *flx_record_copy_normalize(flxRecord *ret_dest, const flxRecord*src);
+flxServer *flx_server_new(GMainContext *c);
+void flx_server_free(flxServer* s);
 
+const flxRecord *flx_server_iterate(flxServer *s, flxEntryGroup *g, void **state);
 void flx_server_dump(flxServer *s, FILE *f);
 
-struct _flxLocalAddrSource;
-typedef struct _flxLocalAddrSource flxLocalAddrSource;
-
-flxLocalAddrSource *flx_local_addr_source_new(flxServer *s);
-void flx_local_addr_source_free(flxLocalAddrSource *l);
-
-#define FLX_DNS_TYPE_A 0x01
-#define FLX_DNS_TYPE_AAAA 0x1C
-#define FLX_DNS_TYPE_PTR 0x0C
-#define FLX_DNS_TYPE_HINFO 0x0D
-#define FLX_DNS_TYPE_CNAME 0x05
-#define FLX_DNS_TYPE_NS 0x02
-#define FLX_DNS_TYPE_SOA 0x06
-#define FLX_DNS_TYPE_MX 0x0F
-#define FLX_DNS_TYPE_TXT 0x10
-
-#define FLX_DNS_CLASS_IN 0x01
-
-#define FLX_DEFAULT_TTL (120*60)
+flxEntryGroup *flx_entry_group_new(flxServer *s, flxEntryGroupCallback callback, gpointer userdata);
+void flx_entry_group_free(flxEntryGroup *g);
+void flx_entry_group_commit(flxEntryGroup *g);
+flxEntryGroupStatus flx_entry_group_get_status(flxEntryGroup *g);
+
+void flx_server_add(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    flxEntryFlags flags,
+    flxRecord *r);
+
+void flx_server_add_ptr(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    flxEntryFlags flags,
+    const gchar *name,
+    const gchar *dest);
+
+void flx_server_add_address(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    flxEntryFlags flags,
+    const gchar *name,
+    flxAddress *a);
+
+void flx_server_add_text(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    flxEntryFlags flags,
+    const gchar *name,
+    ... /* text records, terminated by NULL */);
+
+void flx_server_add_text_va(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    flxEntryFlags flags,
+    const gchar *name,
+    va_list va);
+
+void flx_server_add_service(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    const gchar *type,
+    const gchar *name,
+    const gchar *domain,
+    const gchar *host,
+    guint16 port,
+    ...  /* text records, terminated by NULL */);
+
+void flx_server_add_service_va(
+    flxServer *s,
+    flxEntryGroup *g,
+    gint interface,
+    guchar protocol,
+    const gchar *type,
+    const gchar *name,
+    const gchar *domain,
+    const gchar *host,
+    guint16 port,
+    va_list va);
+
+typedef enum {
+    FLX_SUBSCRIPTION_NEW,
+    FLX_SUBSCRIPTION_REMOVE,
+    FLX_SUBSCRIPTION_CHANGE
+} flxSubscriptionEvent;
+
+typedef struct _flxSubscription flxSubscription;
+
+typedef void (*flxSubscriptionCallback)(flxSubscription *s, flxRecord *record, gint interface, guchar protocol, flxSubscriptionEvent event, gpointer userdata);
+
+flxSubscription *flx_subscription_new(flxServer *s, flxKey *key, gint interface, guchar protocol, flxSubscriptionCallback callback, gpointer userdata);
+void flx_subscription_free(flxSubscription *s);
 
 #endif