tyrolyean
/
mailattach
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some cleanup 

Signed-off-by: Tyrolyean <tyrolyean@tyrolyean.net>
This commit is contained in:
Tyrolyean 2020-04-28 19:14:49 +02:00
parent ec6ad62d57
commit ed1801c804
No known key found for this signature in database
GPG Key ID: 81EC9BAC5E9667C6
2 changed files with 82 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/attach.c
View File

@ -78,7 +78,7 @@ char* attach_files(char* message, size_t len){
printf("Received message header: [%.*s]\n", email.header_len,
email.message);
printf("Received message body: [%s]\n",
printf("Received message body: [%.*s]\n",
email.message + email.body_offset);
/* Now we have a null terminated body which we can edit! */

145
src/main.c
View File

@ -40,6 +40,82 @@ struct client_info {
int fd;
};
void receive_mail(char** input_buffer, size_t *in_len, bool *in_body,
bool *after_body, char** body_p, size_t *body_offs, struct pollfd fds[2],
char *buf, int n){
if(!*in_body){
/* As long as we are outside the real mail body
* we can basically passthrough the commands
*/
*in_len += n;
*input_buffer = realloc(*input_buffer, *in_len);
strncat(*input_buffer,buf, n);
*body_p = detect_start_of_body(*input_buffer);
if(*body_p != NULL){
/* We reached the beginning of the body
* now! */
*body_offs = body_p - input_buffer;
*in_body = true;
write((fds[1].fd),
*input_buffer+(*in_len-n),
*body_offs-(*in_len-n));
printf("Beginning of message found! "
"Awaiting end...\n");
}else{
write((fds[1].fd), buf, n);
}
} else if(!*after_body){
/* We keep the body until we have it completely
*/
*in_len += n;
*input_buffer = realloc(*input_buffer, *in_len);
strncat(*input_buffer, buf, n);
*body_p = detect_end_of_body(*input_buffer+
*body_offs);
if(*body_p != NULL){
printf("Data found, interpreting...\n");
size_t body_len = *body_p-
(*input_buffer+*body_offs);
char* new_body = attach_files(
*input_buffer+*body_offs,
body_len);
if(new_body != NULL){
/* Write the replacement */
write((fds[1].fd), new_body,
strlen(new_body));
free(new_body);
}else{
/* Write the original */
write((fds[1].fd),
*input_buffer+*body_offs,
body_len);
}
/* Rest of conversation after message */
write((fds[1].fd),
*input_buffer+*body_offs+body_len,
*in_len-(*body_offs+body_len));
*after_body = true;
}
}else{
write((fds[1].fd), buf, n);
}
return;
}
void* client_handle_async(void* params){
struct client_info * cli = params;
@ -96,70 +172,11 @@ void* client_handle_async(void* params){
goto closeup;
}
if(i==0 && !in_body){
/* As long as we are outside the real mail body
* we can basically passthrough the commands
*/
in_len += n;
input_buffer = realloc(input_buffer, in_len);
strncat(input_buffer,buf, n);
body_p = detect_start_of_body(input_buffer);
if(body_p != NULL){
/* We reached the beginning of the body
* now! */
body_offs = body_p - input_buffer;
in_body = true;
write((fds[!i].fd),
input_buffer+(in_len-n),
body_offs-(in_len-n));
printf("Beginning of message found! "
"Awaiting end...\n");
}else{
write((fds[!i].fd), buf, n);
}
} else if(i==0 && !after_body){
/* We keep the body until we have it completely
*/
in_len += n;
input_buffer = realloc(input_buffer, in_len);
strncat(input_buffer, buf, n);
body_p = detect_end_of_body(input_buffer+
body_offs);
if(body_p != NULL){
printf("Data found, interpreting...\n");
size_t body_len = body_p-
(input_buffer+body_offs);
char* new_body = attach_files(
input_buffer+body_offs,
body_len);
if(new_body != NULL){
/* Write the replacement */
write((fds[!i].fd), new_body,
strlen(new_body));
free(new_body);
}else{
/* Write the original */
write((fds[!i].fd),
input_buffer+body_offs,
body_len);
}
/* Rest of conversation after message */
write((fds[!i].fd),
input_buffer+body_offs+body_len,
in_len-(body_offs+body_len));
after_body = true;
}
if(i == 0){
receive_mail(&input_buffer,
&in_len, &in_body, &after_body,
&body_p, &body_offs,
fds, buf, n);
}else{
write((fds[!i].fd), buf, n);