if apicall failed - retry

fuse/main.c

@@ -280,7 +280,7 @@ static void connect_mf(struct mediafirefs_user_options *options,
 
     ctx->conn = mfconn_create(options->server, options->username,
                               options->password, options->app_id,
-                              options->api_key);
+                              options->api_key, 3);
 
     if (ctx->conn == NULL) {
         fprintf(stderr, "Cannot establish connection\n");

fuse/operations.c

@@ -426,6 +426,7 @@ int mediafirefs_release(const char *path, struct fuse_file_info *file_info)
 
         folder_key = folder_tree_path_get_key(ctx->tree, ctx->conn, dir_name);
 
+        upload_key = NULL;
         retval = mfconn_api_upload_simple(ctx->conn, folder_key,
                                           fh, file_name, &upload_key);
 

mfapi/apicalls.c

@@ -19,7 +19,6 @@
 #include <jansson.h>
 #include <string.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "../utils/http.h"
 

mfapi/apicalls.h

@@ -61,7 +61,7 @@ int             mfconn_api_file_get_links(mfconn * conn, mffile * file,
 int             mfconn_api_folder_create(mfconn * conn, const char *parent,
                                          const char *name);
 
-long            mfconn_api_folder_get_content(mfconn * conn, int mode,
+long            mfconn_api_folder_get_content(mfconn * conn, const int mode,
                                               const char *folderkey,
                                               mffolder *** folder_result,
                                               mffile *** file_result);

mfapi/apicalls/device_get_changes.c

@@ -43,10 +43,17 @@ int mfconn_api_device_get_changes(mfconn * conn, uint64_t revision,
     const char     *api_call;
     int             retval;
     mfhttp         *http;
+    int             i;
 
     if (conn == NULL)
         return -1;
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
+        if (*changes != NULL) {
+            free(*changes);
+            *changes = NULL;
+        }
+
         api_call = mfconn_create_signed_get(conn, 0, "device/get_changes.php",
                                             "?revision=%" PRIu64
                                             "&response_format=json", revision);
@@ -60,6 +67,23 @@ int mfconn_api_device_get_changes(mfconn * conn, uint64_t revision,
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }
 

mfapi/apicalls/device_get_patch.c

@@ -38,6 +38,7 @@ int mfconn_api_device_get_patch(mfconn * conn, mfpatch * patch,
     int             len;
     mfhttp         *http;
     int             retval;
+    int             i;
 
     if (conn == NULL)
         return -1;
@@ -53,6 +54,7 @@ int mfconn_api_device_get_patch(mfconn * conn, mfpatch * patch,
     if (len != 15)
         return -1;
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
         api_call = mfconn_create_signed_get(conn, 0, "device/get_patch.php",
                                             "?quick_key=%s"
                                             "&source_revision=%" PRIu64
@@ -68,6 +70,23 @@ int mfconn_api_device_get_patch(mfconn * conn, mfpatch * patch,
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }
 

mfapi/apicalls/device_get_status.c

@@ -33,12 +33,12 @@ int mfconn_api_device_get_status(mfconn * conn, uint64_t * revision)
     const char     *api_call;
     int             retval;
     mfhttp         *http;
-
+    int             i;
-    // char        *rx_buffer;
 
     if (conn == NULL)
         return -1;
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
         api_call = mfconn_create_signed_get(conn, 0, "device/get_status.php",
                                             "?response_format=json");
 
@@ -51,6 +51,23 @@ int mfconn_api_device_get_status(mfconn * conn, uint64_t * revision)
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }
 

mfapi/apicalls/device_get_updates.c

@@ -39,6 +39,8 @@ int mfconn_api_device_get_updates(mfconn * conn, const char *quickkey,
     int             len;
     mfhttp         *http;
     int             retval;
+    int             i,
+                    j;
 
     if (conn == NULL)
         return -1;
@@ -54,19 +56,31 @@ int mfconn_api_device_get_updates(mfconn * conn, const char *quickkey,
     if (len != 15)
         return -1;
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
+        if (*patches != NULL) {
+            for (j = 0; (*patches)[j] != NULL; j++) {
+                patch_free((*patches)[j]);
+            }
+            free(*patches);
+            *patches = NULL;
+        }
+
         if (target_revision == 0) {
-        api_call = mfconn_create_signed_get(conn, 0, "device/get_updates.php",
+            api_call = mfconn_create_signed_get(conn, 0,
+                                                "device/get_updates.php",
                                                 "?quick_key=%s"
                                                 "&revision=%" PRIu64
-                                            "&response_format=json", quickkey,
+                                                "&response_format=json",
-                                            revision);
+                                                quickkey, revision);
         } else {
-        api_call = mfconn_create_signed_get(conn, 0, "device/get_updates.php",
+            api_call = mfconn_create_signed_get(conn, 0,
+                                                "device/get_updates.php",
                                                 "?quick_key=%s"
                                                 "&revision=%" PRIu64
                                                 "&target_revision=%" PRIu64
-                                            "&response_format=json", quickkey,
+                                                "&response_format=json",
-                                            revision, target_revision);
+                                                quickkey, revision,
+                                                target_revision);
         }
         http = http_create();
         retval = http_get_buf(http, api_call, _decode_device_get_updates,
@@ -76,6 +90,23 @@ int mfconn_api_device_get_updates(mfconn * conn, const char *quickkey,
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }
 

mfapi/apicalls/file_delete.c

@@ -30,6 +30,7 @@ int mfconn_api_file_delete(mfconn * conn, const char *quickkey)
     const char     *api_call;
     int             retval;
     mfhttp         *http;
+    int             i;
 
     if (conn == NULL)
         return -1;
@@ -40,16 +41,35 @@ int mfconn_api_file_delete(mfconn * conn, const char *quickkey)
     if (strlen(quickkey) != 15)
         return -1;
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
         api_call = mfconn_create_signed_get(conn, 0, "file/delete.php",
-                                        "?quick_key=%s&response_format=json",
+                                            "?quick_key=%s"
-                                        quickkey);
+                                            "&response_format=json", quickkey);
 
         http = http_create();
-    retval = http_get_buf(http, api_call, mfapi_decode_common, "file/delete");
+        retval =
+            http_get_buf(http, api_call, mfapi_decode_common, "file/delete");
         http_destroy(http);
         mfconn_update_secret_key(conn);
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }

mfapi/apicalls/file_get_info.c

@@ -38,6 +38,7 @@ int mfconn_api_file_get_info(mfconn * conn, mffile * file,
     int             retval;
     int             len;
     mfhttp         *http;
+    int             i;
 
     if (conn == NULL)
         return -1;
@@ -53,9 +54,10 @@ int mfconn_api_file_get_info(mfconn * conn, mffile * file,
     if (len != 11 && len != 15)
         return -1;
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
         api_call = mfconn_create_signed_get(conn, 0, "file/get_info.php",
-                                        "?quick_key=%s&response_format=json",
+                                            "?quick_key=%s"
-                                        quickkey);
+                                            "&response_format=json", quickkey);
 
         http = http_create();
         retval = http_get_buf(http, api_call, _decode_file_get_info, file);
@@ -64,6 +66,23 @@ int mfconn_api_file_get_info(mfconn * conn, mffile * file,
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }
 

mfapi/apicalls/file_get_links.c

@@ -36,6 +36,7 @@ int mfconn_api_file_get_links(mfconn * conn, mffile * file,
     int             retval;
     int             len;
     mfhttp         *http;
+    int             i;
 
     if (conn == NULL)
         return -1;
@@ -51,9 +52,10 @@ int mfconn_api_file_get_links(mfconn * conn, mffile * file,
     if (len != 11 && len != 15)
         return -1;
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
         api_call = mfconn_create_signed_get(conn, 0, "file/get_links.php",
-                                        "?quick_key=%s&response_format=json",
+                                            "?quick_key=%s"
-                                        quickkey);
+                                            "&response_format=json", quickkey);
 
         http = http_create();
         retval = http_get_buf(http, api_call, _decode_file_get_links, file);
@@ -62,6 +64,23 @@ int mfconn_api_file_get_links(mfconn * conn, mffile * file,
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }
 

mfapi/apicalls/folder_create.c

@@ -31,6 +31,7 @@ int mfconn_api_folder_create(mfconn * conn, const char *parent,
     const char     *api_call;
     int             retval;
     mfhttp         *http;
+    int             i;
 
     if (conn == NULL)
         return -1;
@@ -45,11 +46,13 @@ int mfconn_api_folder_create(mfconn * conn, const char *parent,
         return -1;
     }
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
         if (parent != NULL) {
             api_call =
                 mfconn_create_signed_get(conn, 0, "folder/create.php",
                                          "?parent_key=%s&foldername=%s"
-                                     "&response_format=json", parent, name);
+                                         "&response_format=json", parent,
+                                         name);
         } else {
             api_call =
                 mfconn_create_signed_get(conn, 0, "folder/create.php",
@@ -65,5 +68,22 @@ int mfconn_api_folder_create(mfconn * conn, const char *parent,
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }

mfapi/apicalls/folder_delete.c

@@ -30,6 +30,7 @@ int mfconn_api_folder_delete(mfconn * conn, const char *folderkey)
     const char     *api_call;
     int             retval;
     mfhttp         *http;
+    int             i;
 
     if (conn == NULL)
         return -1;
@@ -40,8 +41,10 @@ int mfconn_api_folder_delete(mfconn * conn, const char *folderkey)
     if (strlen(folderkey) != 13)
         return -1;
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
         api_call = mfconn_create_signed_get(conn, 0, "folder/delete.php",
-                                        "?folder_key=%s&response_format=json",
+                                            "?folder_key=%s"
+                                            "&response_format=json",
                                             folderkey);
 
         http = http_create();
@@ -52,5 +55,22 @@ int mfconn_api_folder_delete(mfconn * conn, const char *folderkey)
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }

mfapi/apicalls/folder_get_content.c

@@ -46,7 +46,8 @@ static int      _decode_folder_get_content_files(mfhttp * conn, void *data);
  * pointers to them.
  */
 long
-mfconn_api_folder_get_content(mfconn * conn, int mode, const char *folderkey,
+mfconn_api_folder_get_content(mfconn * conn, const int mode,
+                              const char *folderkey,
                               mffolder *** mffolder_result,
                               mffile *** mffile_result)
 {
@@ -54,6 +55,8 @@ mfconn_api_folder_get_content(mfconn * conn, int mode, const char *folderkey,
     int             retval;
     char           *content_type;
     mfhttp         *http;
+    int             i,
+                    j;
 
     if (conn == NULL)
         return -1;
@@ -63,13 +66,34 @@ mfconn_api_folder_get_content(mfconn * conn, int mode, const char *folderkey,
     else
         content_type = "files";
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
+        if (mode == 0) {
+            if (*mffolder_result != NULL) {
+                for (j = 0; (*mffolder_result)[j] != NULL; j++) {
+                    folder_free((*mffolder_result)[j]);
+                }
+                free(*mffolder_result);
+                *mffolder_result = NULL;
+            }
+        } else {
+            if (*mffile_result != NULL) {
+                for (j = 0; (*mffile_result)[j] != NULL; j++) {
+                    file_free((*mffile_result)[j]);
+                }
+                free(*mffile_result);
+                *mffile_result = NULL;
+            }
+        }
+
         if (folderkey == NULL) {
-        api_call = mfconn_create_signed_get(conn, 0, "folder/get_content.php",
+            api_call = mfconn_create_signed_get(conn, 0,
+                                                "folder/get_content.php",
                                                 "?content_type=%s"
                                                 "&response_format=json",
                                                 content_type);
         } else {
-        api_call = mfconn_create_signed_get(conn, 0, "folder/get_content.php",
+            api_call = mfconn_create_signed_get(conn, 0,
+                                                "folder/get_content.php",
                                                 "?folder_key=%s"
                                                 "&content_type=%s"
                                                 "&response_format=json",
@@ -78,13 +102,11 @@ mfconn_api_folder_get_content(mfconn * conn, int mode, const char *folderkey,
 
         http = http_create();
         if (mode == 0)
-        retval =
+            retval = http_get_buf(http, api_call,
-            http_get_buf(http, api_call,
                                   _decode_folder_get_content_folders,
                                   (void *)mffolder_result);
         else
-        retval =
+            retval = http_get_buf(http, api_call,
-            http_get_buf(http, api_call,
                                   _decode_folder_get_content_files,
                                   (void *)mffile_result);
         http_destroy(http);
@@ -92,6 +114,23 @@ mfconn_api_folder_get_content(mfconn * conn, int mode, const char *folderkey,
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }
 

mfapi/apicalls/folder_get_info.c

@@ -38,6 +38,7 @@ mfconn_api_folder_get_info(mfconn * conn, mffolder * folder,
     const char     *api_call;
     int             retval;
     mfhttp         *http;
+    int             i;
 
     if (conn == NULL)
         return -1;
@@ -50,6 +51,7 @@ mfconn_api_folder_get_info(mfconn * conn, mffolder * folder,
         return -1;
     }
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
         if (folderkey == NULL) {
             api_call = mfconn_create_signed_get(conn, 0, "folder/get_info.php",
                                                 "?response_format=json");
@@ -67,6 +69,23 @@ mfconn_api_folder_get_info(mfconn * conn, mffolder * folder,
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     return retval;
 }
 

mfapi/apicalls/upload_poll_upload.c

@@ -42,6 +42,7 @@ mfconn_api_upload_poll_upload(mfconn * conn, const char *upload_key,
     int             retval;
     mfhttp         *http;
     struct upload_poll_upload_response response;
+    int             i;
 
     if (conn == NULL)
         return -1;
@@ -49,6 +50,7 @@ mfconn_api_upload_poll_upload(mfconn * conn, const char *upload_key,
     if (upload_key == NULL)
         return -1;
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
         // make an UNSIGNED get
         api_call = mfconn_create_unsigned_get(conn, 0,
                                               "upload/poll_upload.php",
@@ -62,6 +64,23 @@ mfconn_api_upload_poll_upload(mfconn * conn, const char *upload_key,
 
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     *status = response.status;
     *fileerror = response.fileerror;
 

mfapi/apicalls/upload_simple.c

@@ -44,6 +44,7 @@ mfconn_api_upload_simple(mfconn * conn, const char *folderkey,
     unsigned char   hash[SHA256_DIGEST_LENGTH];
     char           *file_hash;
     uint64_t        file_size;
+    int             i;
 
     if (conn == NULL)
         return -1;
@@ -64,6 +65,12 @@ mfconn_api_upload_simple(mfconn * conn, const char *folderkey,
 
     file_hash = binary2hex(hash, SHA256_DIGEST_LENGTH);
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
+        if (*upload_key != NULL) {
+            free(*upload_key);
+            *upload_key = NULL;
+        }
+
         if (folderkey == NULL) {
             api_call = mfconn_create_signed_get(conn, 0,
                                                 "upload/simple.php",
@@ -85,9 +92,27 @@ mfconn_api_upload_simple(mfconn * conn, const char *folderkey,
         http_destroy(http);
         mfconn_update_secret_key(conn);
 
-    free(file_hash);
         free((void *)api_call);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
+    free(file_hash);
+
     return retval;
 }
 

mfapi/apicalls/user_get_session_token.c

@@ -51,10 +51,20 @@ mfconn_api_user_get_session_token(mfconn * conn, const char *server,
     int             retval;
     struct user_get_session_token_response response;
     mfhttp         *http;
+    int             i;
 
     if (conn == NULL)
         return -1;
 
+    for (i = 0; i < mfconn_get_max_num_retries(conn); i++) {
+        if (*secret_time != NULL) {
+            free(*secret_time);
+            *secret_time = NULL;
+        }
+        if (*session_token != NULL) {
+            free(*session_token);
+            *session_token = NULL;
+        }
         // configure url for operation
         login_url = strdup_printf("https://%s/api/user/get_session_token.php",
                                   server);
@@ -84,6 +94,23 @@ mfconn_api_user_get_session_token(mfconn * conn, const char *server,
         free(login_url);
         free(post_args);
 
+        if (retval != 127 && retval != 28)
+            break;
+
+        // if there was either a curl timeout or a token error, get a new
+        // token and try again
+        //
+        // on a curl timeout we get a new token because it is likely that we
+        // lost signature synchronization (we don't know whether the server
+        // accepted or rejected the last call)
+        fprintf(stderr, "got error %d - negotiate a new token\n", retval);
+        retval = mfconn_refresh_token(conn);
+        if (retval != 0) {
+            fprintf(stderr, "failed to get a new token\n");
+            break;
+        }
+    }
+
     *secret_key = response.secret_key;
     *secret_time = response.secret_time;
     *session_token = response.session_token;

mfapi/mfconn.c

@@ -35,11 +35,16 @@ struct mfconn {
     uint32_t        secret_key;
     char           *secret_time;
     char           *session_token;
+    char           *username;
+    char           *password;
+    int             app_id;
+    char           *app_key;
+    int             max_num_retries;
 };
 
 mfconn         *mfconn_create(const char *server, const char *username,
                               const char *password, int app_id,
-                              const char *app_key)
+                              const char *app_key, int max_num_retries)
 {
     mfconn         *conn;
     int             retval;
@@ -59,24 +64,59 @@ mfconn         *mfconn_create(const char *server, const char *username,
     conn = (mfconn *) calloc(1, sizeof(mfconn));
 
     conn->server = strdup(server);
+    conn->username = strdup(username);
+    conn->password = strdup(password);
+    conn->app_id = app_id;
+    if (app_key != NULL)
+        conn->app_key = strdup(app_key);
+    else
+        conn->app_key = NULL;
+    conn->max_num_retries = max_num_retries;
+    conn->secret_time = NULL;
+    conn->session_token = NULL;
     retval = mfconn_api_user_get_session_token(conn, conn->server,
-                                               username, password, app_id,
+                                               conn->username, conn->password,
-                                               app_key,
+                                               conn->app_id, conn->app_key,
                                                &(conn->secret_key),
                                                &(conn->secret_time),
                                                &(conn->session_token));
 
-    if (retval == 0)
+    if (retval != 0) {
-        return conn;
-    else {
         fprintf(stderr, "error: mfconn_api_user_get_session_token\n");
         return NULL;
     }
+
+    return conn;
+}
+
+int mfconn_refresh_token(mfconn * conn)
+{
+    int             retval;
+
+    free(conn->secret_time);
+    conn->secret_time = NULL;
+    free(conn->session_token);
+    conn->session_token = NULL;
+    retval = mfconn_api_user_get_session_token(conn, conn->server,
+                                               conn->username, conn->password,
+                                               conn->app_id, conn->app_key,
+                                               &(conn->secret_key),
+                                               &(conn->secret_time),
+                                               &(conn->session_token));
+    if (retval != 0) {
+        fprintf(stderr, "user/get_session_token failed\n");
+        return -1;
+    }
+    return 0;
 }
 
 void mfconn_destroy(mfconn * conn)
 {
     free(conn->server);
+    free(conn->username);
+    free(conn->password);
+    if (conn->app_key != NULL)
+        free(conn->app_key);
     free(conn->secret_time);
     free(conn->session_token);
     free(conn);
@@ -334,3 +374,8 @@ uint32_t mfconn_get_secret_key(mfconn * conn)
 {
     return conn->secret_key;
 }
+
+int mfconn_get_max_num_retries(mfconn * conn)
+{
+    return conn->max_num_retries;
+}

mfapi/mfconn.h

@@ -28,7 +28,9 @@ typedef struct mfconn mfconn;
 
 mfconn         *mfconn_create(const char *server, const char *username,
                               const char *password, int app_id,
-                              const char *app_key);
+                              const char *app_key, int max_num_retries);
+
+int             mfconn_refresh_token(mfconn * conn);
 
 void            mfconn_destroy(mfconn * conn);
 
@@ -54,4 +56,7 @@ const char     *mfconn_get_session_token(mfconn * conn);
 const char     *mfconn_get_secret_time(mfconn * conn);
 
 uint32_t        mfconn_get_secret_key(mfconn * conn);
+
+int             mfconn_get_max_num_retries(mfconn * conn);
+
 #endif