OSDN Git Service

ftp: Remove record details
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Wed, 12 Dec 2012 11:52:13 +0000 (13:52 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Wed, 12 Dec 2012 11:57:39 +0000 (13:57 +0200)
Standart service records are already supported by bluetoothd

obexd/plugins/ftp.c

index ff4b761..d53774d 100644 (file)
 #define LST_TYPE "x-obex/folder-listing"
 #define CAP_TYPE "x-obex/capability"
 
-#define FTP_CHANNEL 10
-#define FTP_RECORD "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>                \
-<record>                                                               \
-  <attribute id=\"0x0001\">                                            \
-    <sequence>                                                         \
-      <uuid value=\"0x1106\"/>                                         \
-    </sequence>                                                                \
-  </attribute>                                                         \
-                                                                       \
-  <attribute id=\"0x0004\">                                            \
-    <sequence>                                                         \
-      <sequence>                                                       \
-        <uuid value=\"0x0100\"/>                                       \
-      </sequence>                                                      \
-      <sequence>                                                       \
-        <uuid value=\"0x0003\"/>                                       \
-        <uint8 value=\"%u\" name=\"channel\"/>                         \
-      </sequence>                                                      \
-      <sequence>                                                       \
-        <uuid value=\"0x0008\"/>                                       \
-      </sequence>                                                      \
-    </sequence>                                                                \
-  </attribute>                                                         \
-                                                                       \
-  <attribute id=\"0x0009\">                                            \
-    <sequence>                                                         \
-      <sequence>                                                       \
-        <uuid value=\"0x1106\"/>                                       \
-        <uint16 value=\"0x0102\" name=\"version\"/>                    \
-      </sequence>                                                      \
-    </sequence>                                                                \
-  </attribute>                                                         \
-                                                                       \
-  <attribute id=\"0x0100\">                                            \
-    <text value=\"%s\" name=\"name\"/>                                 \
-  </attribute>                                                         \
-  <attribute id=\"0x0200\">                                            \
-    <uint16 value=\"%u\" name=\"psm\"/>                                        \
-  </attribute>                                                         \
-</record>"
-
 static const uint8_t FTP_TARGET[TARGET_SIZE] = {
                        0xF9, 0xEC, 0x7B, 0xC4, 0x95, 0x3C, 0x11, 0xD2,
                        0x98, 0x4E, 0x52, 0x54, 0x00, 0xDC, 0x9E, 0x09 };
@@ -519,10 +478,6 @@ void ftp_disconnect(struct obex_session *os, void *user_data)
 static struct obex_service_driver ftp = {
        .name = "File Transfer server",
        .service = OBEX_FTP,
-       .channel = FTP_CHANNEL,
-       .port = OBEX_PORT_RANDOM,
-       .secure = TRUE,
-       .record = FTP_RECORD,
        .target = FTP_TARGET,
        .target_size = TARGET_SIZE,
        .connect = ftp_connect,