shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

Unfortunately, blank lines are sometimes produced by config serializer, and

Browse Source 
this interferes with their role as message separator in the lvmetad
protocol. Switch to using "##" on an otherwise blank line as a separator.
This commit is contained in:
Petr Rockai 2012-01-15 11:17:16 +00:00
parent d540685159
commit f43c89bf71
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
daemons/common/daemon-shared.c
View File

@ -38,7 +38,7 @@ int read_buffer(int fd, char **buffer) {
*buffer = new;
} else {
(*buffer)[bytes] = 0;
if ((end = strstr((*buffer) + bytes - 2, "\n\n"))) {
if ((end = strstr((*buffer) + bytes - 4, "\n##\n"))) {
*end = 0;
break; /* success, we have the full message now */
}
@ -58,18 +58,29 @@ fail:
*
* TODO use select on EWOULDBLOCK/EAGAIN to avoid useless spinning
*/
int write_buffer(int fd, char *buffer, int length) {
int write_buffer(int fd, const char *buffer, int length) {
int done = 0;
int written = 0;
write:
while (1) {
int result = write(fd, buffer + written, length - written);
if (result > 0)
written += result;
if (result < 0 && errno != EWOULDBLOCK && errno != EAGAIN)
break; /* too bad */
if (written == length)
return 1; /* done */
return 0; /* too bad */
if (written == length) {
if (done)
return 1;
else
break; /* done */
}
return 0;
}
const char *terminate = "\n##\n";
buffer = terminate;
length = 4;
written = 0;
done = 1;
goto write;
}
char *format_buffer(const char *what, const char *id, va_list ap)
@ -106,10 +117,6 @@ char *format_buffer(const char *what, const char *id, va_list ap)
if (!buffer) goto fail;
}
old = buffer;
dm_asprintf(&buffer, "%s\n", buffer);
dm_free(old);
return buffer;
fail:
dm_free(buffer);

2
daemons/common/daemon-shared.h
View File

@ -2,5 +2,5 @@
#include <libdevmapper.h>
int read_buffer(int fd, char **buffer);
int write_buffer(int fd, char *buffer, int length);
int write_buffer(int fd, const char *buffer, int length);
char *format_buffer(const char *what, const char *id, va_list ap);