ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-09 03:54:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

prevent double-processing of form when fully received.

Browse Source 
add actual call to servald rhizome import bundle.
seems to work, though yet to be tested with a genuine bundle. #9
This commit is contained in:
gardners 2012-09-06 07:52:12 +09:30
parent d342e7b0d2
commit f9a29645a8
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rhizome_direct.c
View File

@ -135,8 +135,20 @@ int rhizome_direct_form_received(rhizome_http_request *r)
case RD_MIME_STATE_MANIFESTHEADERS
|RD_MIME_STATE_DATAHEADERS:
/* A bundle to import */
DEBUGF("Call bundle import for rhizomedata.%d.{manifest,data}",
DEBUGF("Call bundle import for rhizomedata.%d.{data,file}",
r->alarm.poll.fd);
char cmd[1024];
snprintf(cmd,1024,
"servald rhizome import bundle rhizomedirect.%d.data rhizomedirect.%d.manifest",
r->alarm.poll.fd,r->alarm.poll.fd);
cmd[1023]=0;
int rv=system(cmd);
int status=-1;
if (rv!=-1) status=WEXITSTATUS(rv);
DEBUGF("Import returned %d",status);
/* clean up after ourselves */
rhizome_direct_clear_temporary_files(r);
/* and report back to caller.
@ -379,14 +391,18 @@ int rhizome_direct_process_post_multipart_bytes
if (r->source_count<=0) {
DEBUGF("Got to end of multi-part form data");
/* Flush out any remaining data */
if (r->request_length) {
DEBUGF("Flushing last %d bytes",r->request_length);
r->request[r->request_length]=0;
rhizome_direct_process_mime_line(r,r->request,r->request_length);
/* If the form is still being processed, then flush things through */
if (r->request_type<0) {
/* Flush out any remaining data */
if (r->request_length) {
DEBUGF("Flushing last %d bytes",r->request_length);
r->request[r->request_length]=0;
rhizome_direct_process_mime_line(r,r->request,r->request_length);
}
return rhizome_direct_form_received(r);
} else {
/* Form has already been processed, so do nothing */
}
return rhizome_direct_form_received(r);
}
return 0;
}