upgrade obexd to 0.47

[profile/ivi/obexd.git] / plugins / ftp.c

diff --git a/plugins/ftp.c b/plugins/ftp.c
index 2a7a725..ff4b761 100644 (file)
--- a/plugins/ftp.c
+++ b/plugins/ftp.c
@@ -81,7 +81,7 @@
     <sequence>                                                         \
       <sequence>                                                       \
         <uuid value=\"0x1106\"/>                                       \
-        <uint16 value=\"0x0100\" name=\"version\"/>                    \
+        <uint16 value=\"0x0102\" name=\"version\"/>                    \
       </sequence>                                                      \
     </sequence>                                                                \
   </attribute>                                                         \
@@ -89,6 +89,9 @@
   <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] = {
@@ -146,9 +149,6 @@ void *ftp_connect(struct obex_session *os, int *err)
        root_folder = obex_option_root_folder();
 
        manager_register_session(os);
-#ifdef TIZEN_PATCH
-       manager_register_transfer(os);
-#endif
 
        ftp = g_new0(struct ftp_session, 1);
        set_folder(ftp, root_folder);
@@ -172,10 +172,6 @@ int ftp_get(struct obex_session *os, void *user_data)
 
        if (ftp->folder == NULL)
                return -ENOENT;
-#ifdef TIZEN_PATCH
-       if (type == NULL) /*We need to avoid the authorization during folder listing which is a get*/
-               manager_emit_transfer_started(ftp->os);
-#endif
 
        ret = get_by_type(ftp, type);
        if (ret < 0)
@@ -224,10 +220,6 @@ int ftp_chkput(struct obex_session *os, void *user_data)
 
        path = g_build_filename(ftp->folder, name, NULL);
 
-#ifdef TIZEN_PATCH
-       manager_emit_transfer_started(os);
-#endif
-
        ret = obex_put_stream_start(os, path);
 
        g_free(path);
@@ -508,17 +500,10 @@ int ftp_action(struct obex_session *os, void *user_data)
        case 0x01: /* Move/Rename Object */
                return ftp_move(ftp, name, destname);
        default:
-               return -EINVAL;
+               return -ENOSYS;
        }
 }
 
-#ifdef TIZEN_PATCH
-static void ftp_progress(struct obex_session *os, void *user_data)
-{
-       manager_emit_transfer_progress(os);
-}
-#endif
-
 void ftp_disconnect(struct obex_session *os, void *user_data)
 {
        struct ftp_session *ftp = user_data;
@@ -527,28 +512,15 @@ void ftp_disconnect(struct obex_session *os, void *user_data)
 
        manager_unregister_session(os);
 
-#ifdef TIZEN_PATCH
-       manager_unregister_transfer(os);
-#endif
-
        g_free(ftp->folder);
        g_free(ftp);
 }
 
-#ifdef TIZEN_PATCH
-static void ftp_reset(struct obex_session *os, void *user_data)
-{
-       const char *type = obex_get_type(os);
-
-       if (type == NULL)
-               manager_emit_transfer_completed(os);
-}
-#endif
-
 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,
@@ -559,11 +531,7 @@ static struct obex_service_driver ftp = {
        .chkput = ftp_chkput,
        .setpath = ftp_setpath,
        .action = ftp_action,
-       .disconnect = ftp_disconnect,
-#ifdef TIZEN_PATCH
-       .progress = ftp_progress,
-       .reset = ftp_reset
-#endif
+       .disconnect = ftp_disconnect
 };
 
 static int ftp_init(void)