[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3571 - GNUnet/src/applications/fs/collection GNUnet/src/ap
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r3571 - GNUnet/src/applications/fs/collection GNUnet/src/applications/fs/fsui GNUnet/src/applications/fs/uritrack GNUnet/src/transports GNUnet/src/util/disk gnunet-gtk gnunet-gtk/src/plugins/fs |
|
Date: |
Sun, 29 Oct 2006 19:33:01 -0800 (PST) |
Author: grothoff
Date: 2006-10-29 19:32:53 -0800 (Sun, 29 Oct 2006)
New Revision: 3571
Modified:
GNUnet/src/applications/fs/collection/collection.c
GNUnet/src/applications/fs/fsui/download.c
GNUnet/src/applications/fs/fsui/search.c
GNUnet/src/applications/fs/fsui/unindex.c
GNUnet/src/applications/fs/fsui/upload.c
GNUnet/src/applications/fs/uritrack/file_info.c
GNUnet/src/transports/ip.c
GNUnet/src/util/disk/storage.c
gnunet-gtk/gnunet-gtk.glade
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/fs.c
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/upload.c
Log:
bugfixes
Modified: GNUnet/src/applications/fs/collection/collection.c
===================================================================
--- GNUnet/src/applications/fs/collection/collection.c 2006-10-30 02:58:05 UTC
(rev 3570)
+++ GNUnet/src/applications/fs/collection/collection.c 2006-10-30 03:32:53 UTC
(rev 3571)
@@ -360,10 +360,10 @@
GE_ASSERT(ectx, OK ==
ECRS_listDirectory(ectx,
&collectionData->name[strlen(collectionData->name)+1],
- dirLen,
- &metaData,
- &collectCallback,
- &cls));
+ dirLen,
+ &metaData,
+ &collectCallback,
+ &cls));
collectCallback(fi,
NULL,
NO,
Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c 2006-10-30 02:58:05 UTC (rev
3570)
+++ GNUnet/src/applications/fs/fsui/download.c 2006-10-30 03:32:53 UTC (rev
3571)
@@ -564,8 +564,12 @@
if ( (dl->state != FSUI_ACTIVE) &&
(dl->state != FSUI_PENDING) )
return NO;
- dl->state = FSUI_ABORTED;
- PTHREAD_STOP_SLEEP(dl->handle);
+ if (dl->state == FSUI_ACTIVE) {
+ dl->state = FSUI_ABORTED;
+ PTHREAD_STOP_SLEEP(dl->handle);
+ } else {
+ dl->state = FSUI_ABORTED_JOINED;
+ }
return OK;
}
Modified: GNUnet/src/applications/fs/fsui/search.c
===================================================================
--- GNUnet/src/applications/fs/fsui/search.c 2006-10-30 02:58:05 UTC (rev
3570)
+++ GNUnet/src/applications/fs/fsui/search.c 2006-10-30 03:32:53 UTC (rev
3571)
@@ -337,8 +337,14 @@
*/
int FSUI_abortSearch(struct FSUI_Context * ctx,
struct FSUI_SearchList * sl) {
+ if (sl->state == FSUI_PENDING) {
+ sl->state = FSUI_ABORTED_JOINED;
+ return OK;
+ }
+ if (sl->state != FSUI_ACTIVE)
+ return SYSERR;
sl->state = FSUI_ABORTED;
- PTHREAD_STOP_SLEEP(sl->handle);
+ PTHREAD_STOP_SLEEP(sl->handle);
return OK;
}
Modified: GNUnet/src/applications/fs/fsui/unindex.c
===================================================================
--- GNUnet/src/applications/fs/fsui/unindex.c 2006-10-30 02:58:05 UTC (rev
3570)
+++ GNUnet/src/applications/fs/fsui/unindex.c 2006-10-30 03:32:53 UTC (rev
3571)
@@ -184,8 +184,12 @@
if ( (ul->state != FSUI_ACTIVE) &&
(ul->state != FSUI_PENDING) )
return NO;
- ul->state = FSUI_ABORTED;
- PTHREAD_STOP_SLEEP(ul->handle);
+ if (ul->state == FSUI_ACTIVE) {
+ ul->state = FSUI_ABORTED;
+ PTHREAD_STOP_SLEEP(ul->handle);
+ } else {
+ ul->state = FSUI_ABORTED_JOINED;
+ }
return OK;
}
Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c 2006-10-30 02:58:05 UTC (rev
3570)
+++ GNUnet/src/applications/fs/fsui/upload.c 2006-10-30 03:32:53 UTC (rev
3571)
@@ -574,13 +574,22 @@
if ( (ul->state != FSUI_ACTIVE) &&
(ul->state != FSUI_PENDING) )
return NO;
- ul->state = FSUI_ABORTED;
- c = ul->child;
- while (c != NULL) {
- FSUI_abortUpload(ctx, c);
- c = c->next;
+ if (ul->state == FSUI_ACTIVE) {
+ ul->state = FSUI_ABORTED;
+ c = ul->child;
+ while (c != NULL) {
+ FSUI_abortUpload(ctx, c);
+ c = c->next;
+ }
+ PTHREAD_STOP_SLEEP(ul->shared->handle);
+ } else {
+ ul->state = FSUI_ABORTED_JOINED;
+ c = ul->child;
+ while (c != NULL) {
+ FSUI_abortUpload(ctx, c);
+ c = c->next;
+ }
}
- PTHREAD_STOP_SLEEP(ul->shared->handle);
return OK;
}
Modified: GNUnet/src/applications/fs/uritrack/file_info.c
===================================================================
--- GNUnet/src/applications/fs/uritrack/file_info.c 2006-10-30 02:58:05 UTC
(rev 3570)
+++ GNUnet/src/applications/fs/uritrack/file_info.c 2006-10-30 03:32:53 UTC
(rev 3571)
@@ -41,23 +41,19 @@
static struct IPC_SEMAPHORE * createIPC(struct GE_Context * ectx,
struct GC_Configuration * cfg) {
char * basename;
- char * tmpname;
char * ipcName;
struct IPC_SEMAPHORE * sem;
size_t n;
- GC_get_configuration_value_string(cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_HOME_DIRECTORY,
- &basename);
+ GC_get_configuration_value_filename(cfg,
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_HOME_DIRECTORY,
+ &basename);
n = strlen(basename) + 512;
- tmpname = MALLOC(n);
- SNPRINTF(tmpname, n, "%s/directory_ipc_lock", basename);
- ipcName = string_expandFileName(ectx,
- tmpname);
+ ipcName = MALLOC(n);
+ SNPRINTF(ipcName, n, "%s/directory_ipc_lock", basename);
FREE(basename);
- FREE(tmpname);
sem = IPC_SEMAPHORE_CREATE(ectx, ipcName, 1);
FREE(ipcName);
return sem;
@@ -68,11 +64,11 @@
char * new;
char * pfx;
- GC_get_configuration_value_string(cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_HOME_DIRECTORY,
- &pfx);
+ GC_get_configuration_value_filename(cfg,
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_HOME_DIRECTORY,
+ &pfx);
new = MALLOC(strlen(pfx) + strlen(STATE_NAME) + 2);
strcpy(new, pfx);
strcat(new, "/");
@@ -86,11 +82,11 @@
char * nw;
char * pfx;
- GC_get_configuration_value_string(cfg,
- "GNUNET",
- "GNUNET_HOME",
- GNUNET_HOME_DIRECTORY,
- &pfx);
+ GC_get_configuration_value_filename(cfg,
+ "GNUNET",
+ "GNUNET_HOME",
+ GNUNET_HOME_DIRECTORY,
+ &pfx);
nw = MALLOC(strlen(pfx) + strlen(TRACK_OPTION) + 2);
strcpy(nw, pfx);
strcat(nw, "/");
Modified: GNUnet/src/transports/ip.c
===================================================================
--- GNUnet/src/transports/ip.c 2006-10-30 02:58:05 UTC (rev 3570)
+++ GNUnet/src/transports/ip.c 2006-10-30 03:32:53 UTC (rev 3571)
@@ -309,7 +309,7 @@
if (0 != GC_get_configuration_value_string(cfg,
"NETWORK",
"IP",
- "",
+ "eth0",
&ipString)) {
#if LINUX || SOMEBSD || MINGW
if (OK == getAddressFromIOCTL(cfg,
Modified: GNUnet/src/util/disk/storage.c
===================================================================
--- GNUnet/src/util/disk/storage.c 2006-10-30 02:58:05 UTC (rev 3570)
+++ GNUnet/src/util/disk/storage.c 2006-10-30 03:32:53 UTC (rev 3571)
@@ -418,17 +418,20 @@
unsigned int n,
const char * mode) {
int handle;
+ char * fn;
/* open file, open with 600, create if not
present, otherwise overwrite */
GE_ASSERT(ectx, fileName != NULL);
-
+ fn = string_expandFileName(ectx, fileName);
handle = disk_file_open(ectx,
- fileName,
+ fn,
O_CREAT | O_WRONLY,
S_IRUSR | S_IWUSR);
- if (handle == -1)
+ if (handle == -1) {
+ FREE(fn);
return SYSERR;
+ }
GE_ASSERT(ectx,
(n == 0) || (buffer != NULL));
/* write the buffer take length from the beginning */
@@ -436,18 +439,20 @@
GE_LOG_STRERROR_FILE(ectx,
GE_WARNING | GE_USER | GE_IMMEDIATE,
"write",
- fileName);
- disk_file_close(ectx, fileName, handle);
+ fn);
+ disk_file_close(ectx, fn, handle);
+ FREE(fn);
return SYSERR;
}
- disk_file_close(ectx, fileName, handle);
- if (0 != CHMOD(fileName,
+ disk_file_close(ectx, fn, handle);
+ if (0 != CHMOD(fn,
atoo(mode))) {
GE_LOG_STRERROR_FILE(ectx,
GE_WARNING | GE_USER | GE_BULK,
"chmod",
- fileName);
+ fn);
}
+ FREE(fn);
return OK;
}
Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2006-10-30 02:58:05 UTC (rev 3570)
+++ gnunet-gtk/gnunet-gtk.glade 2006-10-30 03:32:53 UTC (rev 3571)
@@ -4541,7 +4541,7 @@
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">False</property>
- <signal name="clicked"
handler="on_closeSearchButton_clicked_" object="searchResultsFrame"
last_modification_time="Sun, 22 Oct 2006 06:14:18 GMT"/>
+ <signal name="clicked"
handler="on_abortSearchButton_clicked_" object="searchPageScrolledWindow"
last_modification_time="Mon, 30 Oct 2006 03:58:55 GMT"/>
<accelerator key="Return" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
</widget>
<packing>
@@ -4560,7 +4560,7 @@
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">False</property>
- <signal name="clicked"
handler="on_closeSearchButton_clicked_" object="searchResultsFrame"
last_modification_time="Sun, 22 Oct 2006 06:14:02 GMT"/>
+ <signal name="clicked"
handler="on_closeSearchButton_clicked_" object="searchPageScrolledWindow"
last_modification_time="Sun, 22 Oct 2006 06:14:02 GMT"/>
<accelerator key="Return" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
</widget>
<packing>
@@ -7868,10 +7868,9 @@
<widget class="GtkButton" id="searchCloseButton">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Stop the
search.</property>
- <property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_closeSearchButton_clicked_fs"
object="searchTabHBox" last_modification_time="Sun, 29 Oct 2006 06:09:02 GMT"/>
+ <signal name="clicked" handler="on_closeSearchButton_clicked_"
object="searchTabHBox" last_modification_time="Sun, 29 Oct 2006 06:09:02 GMT"/>
<child>
<widget class="GtkImage" id="image50">
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2006-10-30 02:58:05 UTC (rev
3570)
+++ gnunet-gtk/src/plugins/fs/download.c 2006-10-30 03:32:53 UTC (rev
3571)
@@ -740,6 +740,10 @@
ggc_tree_selection_selected_foreach
(selection,
&fsuiCallDownloadCallback,
+ &FSUI_abortDownload);
+ ggc_tree_selection_selected_foreach
+ (selection,
+ &fsuiCallDownloadCallback,
&FSUI_stopDownload);
}
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2006-10-30 02:58:05 UTC (rev 3570)
+++ gnunet-gtk/src/plugins/fs/fs.c 2006-10-30 03:32:53 UTC (rev 3571)
@@ -59,6 +59,7 @@
switch (event->type) {
/* search events */
case FSUI_search_started:
+ printf("FSUI: search started\n");
ret = fs_search_started(event->data.SearchStarted.sc.pos,
event->data.SearchStarted.searchURI,
event->data.SearchStarted.anonymityLevel,
@@ -66,31 +67,39 @@
NULL);
break;
case FSUI_search_result:
+ printf("FSUI: search result\n");
fs_search_result_received(event->data.SearchResult.sc.cctx,
&event->data.SearchResult.fi,
event->data.SearchResult.searchURI);
break;
case FSUI_search_error:
+ printf("FSUI: search error\n");
fs_search_aborted(event->data.SearchError.sc.cctx);
break;
case FSUI_search_aborted:
+ printf("FSUI: search aborted\n");
fs_search_aborted(event->data.SearchAborted.sc.cctx);
break;
case FSUI_search_completed:
+ printf("FSUI: search completed\n");
// FIXME...
fs_search_aborted(event->data.SearchCompleted.sc.cctx);
break;
case FSUI_search_suspended:
+ printf("FSUI: search suspended\n");
fs_search_aborted(event->data.SearchSuspended.sc.cctx);
break;
case FSUI_search_resumed:
+ printf("FSUI: search resumed\n");
ret = fs_search_started(event->data.SearchResumed.sc.pos,
event->data.SearchResumed.searchURI,
event->data.SearchResumed.anonymityLevel,
event->data.SearchResumed.fisSize,
event->data.SearchResumed.fis);
+ break;
case FSUI_search_stopped:
- fs_search_aborted(event->data.SearchError.sc.cctx);
+ printf("FSUI: search stopped\n");
+ fs_search_stopped(event->data.SearchStopped.sc.cctx);
break;
@@ -99,10 +108,10 @@
fs_download_aborted(event->data.DownloadAborted.dc.cctx);
break;
case FSUI_download_error:
- fs_download_aborted(event->data.DownloadAborted.dc.cctx);
+ fs_download_aborted(event->data.DownloadError.dc.cctx);
break;
case FSUI_download_suspended:
- fs_download_stopped(event->data.DownloadAborted.dc.cctx);
+ fs_download_stopped(event->data.DownloadSuspended.dc.cctx);
break;
case FSUI_download_progress:
fs_download_update(event->data.DownloadProgress.dc.cctx,
@@ -114,7 +123,7 @@
fs_download_completed(event->data.DownloadCompleted.dc.cctx);
break;
case FSUI_download_stopped:
- fs_download_stopped(event->data.DownloadCompleted.dc.cctx);
+ fs_download_stopped(event->data.DownloadStopped.dc.cctx);
break;
case FSUI_download_started:
ret = fs_download_started(event->data.DownloadStarted.dc.pos,
@@ -129,8 +138,8 @@
break;
case FSUI_download_resumed:
ret = fs_download_started(event->data.DownloadResumed.dc.pos,
- event->data.DownloadStarted.dc.pcctx,
- event->data.DownloadStarted.dc.sctx,
+ event->data.DownloadResumed.dc.pcctx,
+ event->data.DownloadResumed.dc.sctx,
event->data.DownloadResumed.total,
event->data.DownloadResumed.anonymityLevel,
&event->data.DownloadResumed.fi,
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2006-10-30 02:58:05 UTC (rev 3570)
+++ gnunet-gtk/src/plugins/fs/search.c 2006-10-30 03:32:53 UTC (rev 3571)
@@ -318,10 +318,10 @@
= glade_xml_new(getGladeFileName(),
"searchTabLabelWindow",
PACKAGE_NAME);
+ connectGladeWithPlugins(list->labelXML);
list->tab_label
= extractMainWidgetFromWindow(list->labelXML,
"searchTabLabelWindow");
-
/* process existing results */
for (i=0;i<resultCount;i++)
fs_search_result_received(list,
@@ -385,6 +385,7 @@
* Update views accordingly.
*/
void fs_search_aborted(SearchList * list) {
+ printf("search aborted\n");
/* FIXME: show aborted status somehow! */
}
@@ -616,6 +617,7 @@
SearchList * list;
struct FCBC fcbc;
+ printf("close button clicked\n");
list = search_head;
while (list != NULL) {
if ( (list->searchpage == searchPage) ||
@@ -624,10 +626,13 @@
list = list->next;
}
GE_ASSERT(ectx, list != NULL);
- fcbc.method = &FSUI_stopSearch;
+ fcbc.method = &FSUI_abortSearch;
fcbc.argument = list->fsui_list;
run_with_save_calls(&fsui_callback,
&fcbc);
+ fcbc.method = &FSUI_stopSearch;
+ run_with_save_calls(&fsui_callback,
+ &fcbc);
}
/**
@@ -637,6 +642,7 @@
GtkWidget * closeButton) {
SearchList * list;
+ printf("abort button clicked\n");
list = search_head;
while (list != NULL) {
if (list->searchpage == searchPage)
@@ -661,10 +667,13 @@
SEARCH_SUMMARY_INTERNAL, &s,
-1);
if (s != NULL) {
- fcbc.method = &FSUI_stopSearch;
+ fcbc.method = &FSUI_abortSearch;
fcbc.argument = s->fsui_list;
run_with_save_calls(&fsui_callback,
&fcbc);
+ fcbc.method = &FSUI_stopSearch;
+ run_with_save_calls(&fsui_callback,
+ &fcbc);
}
}
@@ -675,6 +684,7 @@
GtkWidget * treeview) {
GtkTreeSelection * selection;
+ printf("stop summary button clicked\n");
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
ggc_tree_selection_selected_foreach
(selection,
@@ -709,6 +719,7 @@
GtkWidget * treeview) {
GtkTreeSelection * selection;
+ printf("abort summary button clicked\n");
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
ggc_tree_selection_selected_foreach
(selection,
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2006-10-30 02:58:05 UTC (rev 3570)
+++ gnunet-gtk/src/plugins/fs/upload.c 2006-10-30 03:32:53 UTC (rev 3571)
@@ -496,6 +496,10 @@
ggc_tree_selection_selected_foreach
(selection,
&fsuiCallUploadCallback,
+ &FSUI_abortUpload);
+ ggc_tree_selection_selected_foreach
+ (selection,
+ &fsuiCallUploadCallback,
&FSUI_stopUpload);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r3571 - GNUnet/src/applications/fs/collection GNUnet/src/applications/fs/fsui GNUnet/src/applications/fs/uritrack GNUnet/src/transports GNUnet/src/util/disk gnunet-gtk gnunet-gtk/src/plugins/fs,
grothoff <=