X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=libcitadel%2Flib%2Flibcitadel.h;h=296d1cee50a0de60f1a7bef41184198ce4524931;hb=dc4679ebfb997ad5941b5a32b8e0f1fd0488ea68;hp=d0a24b4221832658f918564c027db56aef410d85;hpb=0daf8cf6c657b725c2d53776ba766d632456a891;p=citadel.git

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index d0a24b422..296d1cee5 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#define LIBCITADEL_VERSION_NUMBER	810
+#define LIBCITADEL_VERSION_NUMBER	813
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.
@@ -255,8 +255,10 @@ typedef struct __fd_iobuffer {
 	IOBuffer *IOB;
 	int OtherFD;
 	int SplicePipe[2];
+	int PipeSize;
 	long TotalSendSize;
 	long TotalSentAlready;
+	long TotalReadAlready;
 	long ChunkSize;
 	long ChunkSendRemain;
 	StrBuf *ChunkBuffer; /* just used if we don't have sendfile */
@@ -267,6 +269,7 @@ void FDIOBufferInit(FDIOBuffer *FDB, IOBuffer *IO, int FD, long TotalSendSize);
 void FDIOBufferDelete(FDIOBuffer *FDB);
 int FileSendChunked(FDIOBuffer *FDB, const char **Err);
 int FileRecvChunked(FDIOBuffer *FDB, const char **Err);
+int FileMoveChunked(FDIOBuffer *FDB, const char **Err);
 eReadState WriteIOBAlreadyRead(FDIOBuffer *FDB, const char **Error);
 
 long StrBuf_read_one_chunk_callback (int fd, short event, IOBuffer *FB);
@@ -278,6 +281,7 @@ long IOBufferStrLength(IOBuffer *FB);
 
 int StrBufSipLine(StrBuf *LineBuf, const StrBuf *Buf, const char **Ptr);
 int StrBufReplaceToken(StrBuf *Buf, long where, long HowLong, const char *Repl, long ReplLen);
+int StrBufExtract_tokenFromStr(StrBuf *dest, const char *Source, long SourceLen, int parmnum, char separator);
 int StrBufExtract_token(StrBuf *dest, const StrBuf *Source, int parmnum, char separator);
 int StrBufSub(StrBuf *dest, const StrBuf *Source, unsigned long Offset, size_t nChars);
 
@@ -387,6 +391,9 @@ struct ParsedURL {
 	struct hostent *HEnt;
 	struct sockaddr_in6 Addr;
 	ParsedURL *Next;
+	int IsRelay;
+	StrBuf *UsrName;
+	StrBuf *Password;
 };
 
 void FreeURL(ParsedURL** Url);