aboutsummaryrefslogtreecommitdiff
path: root/src/fs/gnunet-service-fs_pr.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-07-17 21:46:49 +0000
committerChristian Grothoff <christian@grothoff.org>2013-07-17 21:46:49 +0000
commit5a93bd4fd60d91de3b0756c78550297fd7fbfc55 (patch)
treeea8b2d25929744178e6f3cbdbc814816b24068a6 /src/fs/gnunet-service-fs_pr.c
parentfc420d620e874f4dcba2ba37c544407019076930 (diff)
downloadgnunet-5a93bd4fd60d91de3b0756c78550297fd7fbfc55.tar.gz
gnunet-5a93bd4fd60d91de3b0756c78550297fd7fbfc55.zip
-renaming stream->mesh where applicable
Diffstat (limited to 'src/fs/gnunet-service-fs_pr.c')
-rw-r--r--src/fs/gnunet-service-fs_pr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index de7a729b6..53be142db 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -67,7 +67,7 @@
67 * If obtaining a block via mesh fails, how often do we retry it before 67 * If obtaining a block via mesh fails, how often do we retry it before
68 * giving up for good (and sticking to non-anonymous transfer)? 68 * giving up for good (and sticking to non-anonymous transfer)?
69 */ 69 */
70#define STREAM_RETRY_MAX 3 70#define MESH_RETRY_MAX 3
71 71
72 72
73/** 73/**
@@ -116,9 +116,9 @@ struct GSF_PendingRequest
116 struct GNUNET_DHT_GetHandle *gh; 116 struct GNUNET_DHT_GetHandle *gh;
117 117
118 /** 118 /**
119 * Stream request handle for this request (or NULL for none). 119 * Mesh request handle for this request (or NULL for none).
120 */ 120 */
121 struct GSF_StreamRequest *mesh_request; 121 struct GSF_MeshRequest *mesh_request;
122 122
123 /** 123 /**
124 * Function to call upon completion of the local get 124 * Function to call upon completion of the local get
@@ -1163,7 +1163,7 @@ mesh_reply_proc (void *cls,
1163 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1163 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1164 "Error retrieiving block via mesh\n"); 1164 "Error retrieiving block via mesh\n");
1165 pr->mesh_retry_count++; 1165 pr->mesh_retry_count++;
1166 if (pr->mesh_retry_count >= STREAM_RETRY_MAX) 1166 if (pr->mesh_retry_count >= MESH_RETRY_MAX)
1167 return; /* give up on mesh */ 1167 return; /* give up on mesh */
1168 /* retry -- without delay, as this is non-anonymous 1168 /* retry -- without delay, as this is non-anonymous
1169 and mesh/mesh connect will take some time anyway */ 1169 and mesh/mesh connect will take some time anyway */
@@ -1186,7 +1186,7 @@ mesh_reply_proc (void *cls,
1186 return; 1186 return;
1187 } 1187 }
1188 GNUNET_STATISTICS_update (GSF_stats, 1188 GNUNET_STATISTICS_update (GSF_stats,
1189 gettext_noop ("# Replies received from STREAM"), 1, 1189 gettext_noop ("# Replies received from MESH"), 1,
1190 GNUNET_NO); 1190 GNUNET_NO);
1191 memset (&prq, 0, sizeof (prq)); 1191 memset (&prq, 0, sizeof (prq));
1192 prq.data = data; 1192 prq.data = data;