# HG changeset patch # User Eric Warmenhoven # Date 957131224 0 # Node ID bc117fbcf527c114b3e3c53faa50e8b9a97d8e3a # Parent be5fbefdb195f4ee83f92f186a156dbd9abdffd7 [gaim-migrate @ 210] Made the receive non-blocking, added a cancel button, and a few other updates. No, sending a file to someone does not work yet. Be patient. committer: Tailor Script diff -r be5fbefdb195 -r bc117fbcf527 sounds/au2h.c --- a/sounds/au2h.c Sun Apr 30 10:42:46 2000 +0000 +++ b/sounds/au2h.c Sun Apr 30 21:47:04 2000 +0000 @@ -3,6 +3,7 @@ #include #endif #include +#include #define BUF_SIZE 10 @@ -10,7 +11,6 @@ { int fd; FILE *f; - int cnt; int res,x; char buf[BUF_SIZE]; diff -r be5fbefdb195 -r bc117fbcf527 src/aim.c --- a/src/aim.c Sun Apr 30 10:42:46 2000 +0000 +++ b/src/aim.c Sun Apr 30 21:47:04 2000 +0000 @@ -446,7 +446,7 @@ } } -extern show_debug(GtkObject *); +extern void show_debug(GtkObject *); int main(int argc, char *argv[]) { diff -r be5fbefdb195 -r bc117fbcf527 src/gnome_applet_mgr.c --- a/src/gnome_applet_mgr.c Sun Apr 30 10:42:46 2000 +0000 +++ b/src/gnome_applet_mgr.c Sun Apr 30 21:47:04 2000 +0000 @@ -91,8 +91,6 @@ gboolean result = TRUE; char *path; GdkImlibImage *im; - GdkPixmap *temp_pm; - GdkPixmap *temp_bm; path = gnome_pixmap_file(name); @@ -132,7 +130,6 @@ ****************************************************************/ gboolean update_applet( gpointer *ap ){ - char temp_string[25]; static enum gaim_user_states old_user_status = offline; if( MRI_user_status != old_user_status || ap){ @@ -366,7 +363,6 @@ ** ****************************************************************/ GtkAllocation get_applet_pos(){ - GtkAllocation pos; gint x,y,pad; GtkRequisition buddy_req, applet_req; GtkAllocation result; diff -r be5fbefdb195 -r bc117fbcf527 src/rvous.c --- a/src/rvous.c Sun Apr 30 10:42:46 2000 +0000 +++ b/src/rvous.c Sun Apr 30 21:47:04 2000 +0000 @@ -39,6 +39,22 @@ static void do_send_file(GtkWidget *, struct file_transfer *); static void do_get_file (GtkWidget *, struct file_transfer *); +static void toggle(GtkWidget *w, int *m) +{ + *m = !(*m); +} + +static void free_ft(struct file_transfer *ft) +{ + if (ft->window) { gtk_widget_destroy(ft->window); ft->window = NULL; } + if (ft->filename) g_free(ft->filename); + if (ft->user) g_free(ft->user); + if (ft->message) g_free(ft->message); + if (ft->ip) g_free(ft->ip); + if (ft->cookie) g_free(ft->cookie); + g_free(ft); +} + static void warn_callback(GtkWidget *widget, struct file_transfer *ft) { show_warn_dialog(ft->user); @@ -62,15 +78,7 @@ ft->cookie, ft->UID); sflap_send(send, strlen(send), TYPE_DATA); g_free(send); - gtk_widget_destroy(ft->window); - ft->window = NULL; - g_free(ft->user); - if (ft->message) - g_free(ft->message); - g_free(ft->filename); - if (ft->cookie) g_free(ft->cookie); - g_free(ft->ip); - g_free(ft); + free_ft(ft); } static void accept_callback(GtkWidget *widget, struct file_transfer *ft) @@ -140,7 +148,8 @@ struct sockaddr_in sin; guint32 rcv; char *c; - GtkWidget *fw = NULL, *fbar = NULL, *label; + int cont = 1; + GtkWidget *fw = NULL, *fbar = NULL, *label = NULL, *button = NULL; if (!(ft->f = fopen(file,"w"))) { buf = g_malloc(BUF_LONG); @@ -180,6 +189,7 @@ if(read_rv < 0) { close(ft->fd); g_free(header); + free_ft(ft); return; } rcv += read_rv; @@ -208,6 +218,7 @@ if(read_rv < 0) { close(ft->fd); g_free(header); + free_ft(ft); return; } rcv += read_rv; @@ -245,6 +256,10 @@ fbar = gtk_progress_bar_new(); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->action_area), fbar, 0, 0, 5); gtk_widget_show(fbar); + button = gtk_button_new_with_label("Cancel"); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->action_area), button, 0, 0, 5); + gtk_widget_show(button); + gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc)toggle, &cont); gtk_window_set_title(GTK_WINDOW(fw), "File Transfer"); gtk_widget_realize(fw); aol_icon(fw->window); @@ -254,15 +269,16 @@ ft->user, ft->size); debug_print(debug_buff); - while (rcv != ft->size) { + while (rcv != ft->size && cont) { int i; int remain = ft->size - rcv > 1024 ? 1024 : ft->size - rcv; - read_rv = read(ft->fd, buf, remain); + read_rv = recv(ft->fd, buf, remain, O_NONBLOCK); if(read_rv < 0) { fclose(ft->f); close(ft->fd); g_free(buf); g_free(header); + free_ft(ft); return; } rcv += read_rv; @@ -276,8 +292,19 @@ while(gtk_events_pending()) gtk_main_iteration(); } + fclose(ft->f); - fclose(ft->f); + if (!cont) { + char *tmp = frombase64(ft->cookie); + sprintf(buf, "toc_rvous_cancel %s %s %s", ft->user, tmp, ft->UID); + sflap_send(buf, strlen(buf), TYPE_DATA); + gtk_widget_destroy(fw); + fw = NULL; + close(ft->fd); + free_ft(ft); + return; + } + memset(header + 18, 0, 4); header[94] = 0; header[1] = 0x04; @@ -289,14 +316,7 @@ g_free(buf); g_free(header); - gtk_widget_destroy(fw); - g_free(ft->cookie); - g_free(ft->ip); - if (ft->message) - g_free(ft->message); - g_free(ft->filename); - g_free(ft->user); - g_free(ft); + free_ft(ft); } static void do_send_file(GtkWidget *w, struct file_transfer *ft) { @@ -356,39 +376,37 @@ /* 1. build/send header */ buf = frombase64(ft->cookie); - sprintf(debug_buff, "Building header to send %s\n", file); + sprintf(debug_buff, "Building header to send %s (cookie: %s)\n", file, buf); debug_print(debug_buff); - fhdr->hdrtype = 0x101; + fhdr->hdrtype = 0x1108; snprintf(fhdr->bcookie, 9, "%s", buf); g_free(buf); - fhdr->encrypt = htons(0); - fhdr->compress = htons(0); - fhdr->totfiles = htons(1); - fhdr->filesleft = htons(1); - fhdr->totparts = htons(1); - fhdr->partsleft = htons(1); - fhdr->totsize = htonl((long)(st.st_size)); + fhdr->encrypt = 0; + fhdr->compress = 0; + fhdr->totfiles = 1; + fhdr->filesleft = 1; + fhdr->totparts = 1; + fhdr->partsleft = 1; + fhdr->totsize = (long)st.st_size; fhdr->size = htonl((long)(st.st_size)); fhdr->modtime = htonl(0); fhdr->checksum = htonl(0); /* FIXME? */ - fhdr->rfrcsum = htonl(0); - fhdr->rfsize = htonl(0); - fhdr->cretime = htonl(0); - fhdr->rfcsum = htonl(0); - fhdr->nrecvd = htonl(0); - fhdr->recvcsum = htonl(0); + fhdr->rfrcsum = 0; + fhdr->rfsize = 0; + fhdr->cretime = 0; + fhdr->rfcsum = 0; + fhdr->nrecvd = 0; + fhdr->recvcsum = 0; snprintf(fhdr->idstring, 32, "Gaim"); fhdr->flags = 0x20; /* don't ask me why */ - fhdr->lnameoffset = htonl(0); - fhdr->lsizeoffset = htonl(0); - snprintf(fhdr->dummy, 69, ""); - snprintf(fhdr->macfileinfo, 16, ""); - fhdr->nencode = htons(0); - fhdr->nlanguage = htons(0); - c = &file[strlen(file) - 1]; - while (*(c - 1) != '/') c--; - snprintf(fhdr->name, 64, "%s", c); - snprintf(bmagic, 7, "GAIM\001\000"); + fhdr->lnameoffset = 0x1A; + fhdr->lsizeoffset = 0x10; + fhdr->dummy[0] = 0; + fhdr->macfileinfo[0] = 0; + fhdr->nencode = 0; + fhdr->nlanguage = 0; + snprintf(fhdr->name, 64, "listing.txt"); + snprintf(bmagic, 7, "OFT2\001\000"); read_rv = write(ft->fd, bmagic, 6); if (read_rv <= -1) { sprintf(debug_buff, "Couldn't write opening header \n"); @@ -448,7 +466,7 @@ rcv = 0; buf = g_malloc(2048); fw = gtk_dialog_new(); - snprintf(buf, 2048, "Sendin %s to %s (%d bytes)", fhdr->name, + snprintf(buf, 2048, "Sendin %s to %s (%ld bytes)", fhdr->name, ft->user, fhdr->size); label = gtk_label_new(buf); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->vbox), label, 0, 0, 5); @@ -479,7 +497,7 @@ return; } rcv += read_rv; - snprintf(buf, 2048, "Sending %s to %s (%d / %d bytes)", + snprintf(buf, 2048, "Sending %s to %s (%d / %ld bytes)", fhdr->name, ft->user, rcv, st.st_size); gtk_label_set_text(GTK_LABEL(label), buf); gtk_progress_bar_update(GTK_PROGRESS_BAR(fbar), @@ -510,12 +528,6 @@ fclose(ft->f); close(ft->fd); g_free(fhdr); - g_free(ft->cookie); - g_free(ft->ip); - if (ft->message) - g_free(ft->message); - g_free(ft->user); - g_free(ft); } void accept_file_dialog(struct file_transfer *ft) diff -r be5fbefdb195 -r bc117fbcf527 src/server.c --- a/src/server.c Sun Apr 30 10:42:46 2000 +0000 +++ b/src/server.c Sun Apr 30 21:47:04 2000 +0000 @@ -217,7 +217,7 @@ if (message) g_snprintf(buf, MSG_LEN, "toc_set_away \"%s\"", message); else - g_snprintf(buf, MSG_LEN, "toc_set_away"); + g_snprintf(buf, MSG_LEN, "toc_set_away \"\""); sflap_send(buf, -1, TYPE_DATA); #endif } diff -r be5fbefdb195 -r bc117fbcf527 src/toc.c --- a/src/toc.c Sun Apr 30 10:42:46 2000 +0000 +++ b/src/toc.c Sun Apr 30 21:47:04 2000 +0000 @@ -589,7 +589,6 @@ int unk[4]; char *messages[4]; int subtype, files, totalsize; - int temp; char *name; char *tmp; int i;