Changeset 194 for trunk

Timestamp:

09/05/07 15:02:32 (15 months ago)

Author:

zany

Message:

switching obexftpd to bt_kit

Location:

trunk

Files:

• apps/Makefile.am (modified) (1 diff)
• apps/obexftpd.c (modified) (3 diffs)
• obexftp/client.c (modified) (3 diffs)
• obexftp/client.h (modified) (2 diffs)
• obexftp/obexftp.h (modified) (2 diffs)

trunk/apps/Makefile.am

@@ -13 +13 @@
 obexftp_SOURCES =               obexftp.c
 
-obexftpd_SOURCES =              obexftpd.c obexftp_sdp.c obexftp_sdp.h
+obexftpd_SOURCES =              obexftpd.c
 stress_SOURCES =                stress.c
 discovery_SOURCES =             discovery.c

trunk/apps/obexftpd.c

@@ -68 +68 @@
 #include <common.h>
 
-#include "obexftp_sdp.h"
-
 /* define this to "", "\r\n" or "\n" */
 #define EOLCHARS "\n"
@@ -857 +855 @@
         }
 
-        if (transport==OBEX_TRANS_BLUETOOTH && 0 > obexftp_sdp_register(channel))
+        if (transport==OBEX_TRANS_BLUETOOTH && 0 > obexftp_sdp_register_ftp(channel))
         {
                 //OBEX_Cleanup(handle);
@@ -933 +931 @@
         {
                 fprintf(stderr, "sdp unregister\n");
-                obexftp_sdp_unregister();
+                obexftp_sdp_unregister_ftp();
         }
 

trunk/obexftp/client.c

@@ -1203 +1203 @@
 #else
         return NULL;
-#endif HAVE_BLUETOOTH
+#endif /* HAVE_BLUETOOTH */
 }
 
@@ -1213 +1213 @@
 #else
         return NULL;
-#endif HAVE_BLUETOOTH
+#endif /* HAVE_BLUETOOTH */
 }
 
@@ -1223 +1223 @@
 #else
         return 0;
-#endif HAVE_BLUETOOTH
+#endif /* HAVE_BLUETOOTH */
+}
+
+
+int obexftp_sdp_register(int svclass, int channel)
+{
+#ifdef HAVE_BLUETOOTH
+        return btkit_register_obex(svclass, channel);
+#else
+        return 0;
+#endif /* HAVE_BLUETOOTH */
+}
+
+
+int obexftp_sdp_unregister(int svclass)
+{
+#ifdef HAVE_BLUETOOTH
+        return btkit_unregister_service(svclass);
+#else
+        return 0;
+#endif /* HAVE_BLUETOOTH */
 }
 

trunk/obexftp/client.h

@@ -56 +56 @@
 #define DEFAULT_CACHE_TIMEOUT 180       /* 3 minutes */
 #define DEFAULT_CACHE_MAXSIZE 10240     /* 10k */
-
-/* bt svclass */
-#define OBEX_SYNC_SERVICE       0x1104
-#define OBEX_PUSH_SERVICE       0x1105
-#define OBEX_FTP_SERVICE        0x1106
 
 /* types */
@@ -124 +119 @@
 void obexftp_close(/*@only@*/ /*@out@*/ /*@null@*/ obexftp_client_t *cli);
 
-char **obexftp_discover(int transport);
-char **obexftp_discover_bt_src(const char *src); /* HCI no. or address */
-#define obexftp_discover_bt() \
-        obexftp_discover_bt_src(NULL)
-
-char *obexftp_bt_name_src(const char *addr, const char *src);
-#define obexftp_bt_name(addr) \
-        obexftp_bt_name_src(addr, NULL)
-
-int obexftp_browse_bt_src(const char *src, const char *addr, int svclass);
-#define obexftp_browse_bt(device, service) \
-        obexftp_browse_bt_src(NULL, device, service)
-#define obexftp_browse_bt_ftp(device) \
-        obexftp_browse_bt_src(NULL, device, OBEX_FTP_SERVICE)
-#define obexftp_browse_bt_push(device) \
-        obexftp_browse_bt_src(NULL, device, OBEX_PUSH_SERVICE)
-#define obexftp_browse_bt_sync(device) \
-        obexftp_browse_bt_src(NULL, device, OBEX_SYNC_SERVICE)
-
 int obexftp_connect_uuid(obexftp_client_t *cli,
                                 /*@null@*/ const char *device, /* for INET, BLUETOOTH */

trunk/obexftp/obexftp.h

@@ -27 +27 @@
 #endif
 
+
 /** ObexFTP message callback prototype. */
 typedef void (*obexftp_info_cb_t) (int event, const char *buf, int len, void *data);
@@ -54 +55 @@
 #define STREAM_CHUNK 4096
 
+/* bt svclass */
+#define OBEX_SYNC_SERVICE       0x1104
+#define OBEX_PUSH_SERVICE       0x1105
+#define OBEX_FTP_SERVICE        0x1106
+
+/* server and client helpers for bt */
+
+char **obexftp_discover(int transport);
+char **obexftp_discover_bt_src(const char *src); /* HCI no. or address */
+#define obexftp_discover_bt() \
+        obexftp_discover_bt_src(NULL)
+
+char *obexftp_bt_name_src(const char *addr, const char *src);
+#define obexftp_bt_name(addr) \
+        obexftp_bt_name_src(addr, NULL)
+
+int obexftp_browse_bt_src(const char *src, const char *addr, int svclass);
+#define obexftp_browse_bt(device, service) \
+        obexftp_browse_bt_src(NULL, device, service)
+#define obexftp_browse_bt_ftp(device) \
+        obexftp_browse_bt_src(NULL, device, OBEX_FTP_SERVICE)
+#define obexftp_browse_bt_push(device) \
+        obexftp_browse_bt_src(NULL, device, OBEX_PUSH_SERVICE)
+#define obexftp_browse_bt_sync(device) \
+        obexftp_browse_bt_src(NULL, device, OBEX_SYNC_SERVICE)
+
+int obexftp_sdp_register(int svclass, int channel);
+#define obexftp_sdp_register_ftp(channel) \
+        obexftp_sdp_register(OBEX_FTP_SERVICE, channel)
+#define obexftp_sdp_register_push(channel) \
+        obexftp_sdp_register(OBEX_PUSH_SERVICE, channel)
+#define obexftp_sdp_register_sync(channel) \
+        obexftp_sdp_register(OBEX_SYNC_SERVICE, channel)
+int obexftp_sdp_unregister(int svclass);
+#define obexftp_sdp_unregister_ftp() \
+        obexftp_sdp_unregister(OBEX_FTP_SERVICE)
+#define obexftp_sdp_unregister_push() \
+        obexftp_sdp_unregister(OBEX_PUSH_SERVICE)
+#define obexftp_sdp_unregister_sync() \
+        obexftp_sdp_unregister(OBEX_SYNC_SERVICE)
+
+
 #ifdef __cplusplus
 }