denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed UCI thread cancellation on ARM

Browse Source
This commit is contained in:
Martin Willi
2008-07-24 08:52:12 +00:00
parent 3bc5a137cb
commit b6bf863459
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/plugins/uci/uci_control.c
+19 -22
View File
@@ -237,35 +237,32 @@ static void process(private_uci_control_t *this, char *message)
*/ */
static job_requeue_t receive(private_uci_control_t *this) static job_requeue_t receive(private_uci_control_t *this)
{ {
while (TRUE) char message[128];
{ int oldstate, len;
char message[128]; FILE *in;
int oldstate, len;
FILE *in;
memset(message, 0, sizeof(message)); memset(message, 0, sizeof(message));
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
in = fopen(FIFO_FILE, "r"); in = fopen(FIFO_FILE, "r");
pthread_setcancelstate(oldstate, NULL); pthread_setcancelstate(oldstate, NULL);
if (in) if (in)
{
len = fread(message, 1, sizeof(message) - 1, in);
fclose(in);
if (len > 0)
{ {
len = fread(message, 1, sizeof(message) - 1, in); process(this, message);
fclose(in);
if (len > 0)
{
process(this, message);
}
else
{
DBG1(DBG_DMN, "reading from UCI fifo failed: %s", strerror(errno));
}
} }
else else
{ {
DBG1(DBG_DMN, "opening UCI fifo failed: %s", strerror(errno)); DBG1(DBG_DMN, "reading from UCI fifo failed: %s", strerror(errno));
} }
} }
return JOB_REQUEUE_NONE; else
{
DBG1(DBG_DMN, "opening UCI fifo failed: %s", strerror(errno));
}
return JOB_REQUEUE_FAIR;
} }
/** /**