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

tnccs: Use chunk_map() instead of non-portable mmap()

Browse Source
This commit is contained in:
Martin Willi
2014-01-23 15:55:33 +01:00
parent 88fa7f62be
commit 7ae878c357
2 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtnccs/plugins/tnc_imv/tnc_imv_manager.c
-1
View File
@@ -21,7 +21,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
src/libtnccs/tnc/tnc.c
+6 -26
View File
@@ -17,7 +17,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/mman.h>
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
@@ -94,10 +93,8 @@ void libtnccs_deinit(void)
static bool load_imcvs_from_config(char *filename, bool is_imc) static bool load_imcvs_from_config(char *filename, bool is_imc)
{ {
bool success = FALSE; bool success = FALSE;
int fd, line_nr = 0; int line_nr = 0;
chunk_t src, line; chunk_t *src, line;
struct stat sb;
void *addr;
char *label; char *label;
if (!filename || !*filename) if (!filename || !*filename)
@@ -108,30 +105,15 @@ static bool load_imcvs_from_config(char *filename, bool is_imc)
label = is_imc ? "IMC" : "IMV"; label = is_imc ? "IMC" : "IMV";
DBG1(DBG_TNC, "loading %ss from '%s'", label, filename); DBG1(DBG_TNC, "loading %ss from '%s'", label, filename);
fd = open(filename, O_RDONLY); src = chunk_map(filename, FALSE);
if (fd == -1) if (!src)
{ {
DBG1(DBG_TNC, "opening configuration file '%s' failed: %s", filename, DBG1(DBG_TNC, "opening configuration file '%s' failed: %s", filename,
strerror(errno)); strerror(errno));
return FALSE; return FALSE;
} }
if (fstat(fd, &sb) == -1)
{
DBG1(DBG_LIB, "getting file size of '%s' failed: %s", filename,
strerror(errno));
close(fd);
return FALSE;
}
addr = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
if (addr == MAP_FAILED)
{
DBG1(DBG_LIB, "mapping '%s' failed: %s", filename, strerror(errno));
close(fd);
return FALSE;
}
src = chunk_create(addr, sb.st_size);
while (fetchline(&src, &line)) while (fetchline(src, &line))
{ {
char *name, *path; char *name, *path;
chunk_t token; chunk_t token;
@@ -201,8 +183,7 @@ static bool load_imcvs_from_config(char *filename, bool is_imc)
break; break;
} }
} }
munmap(addr, sb.st_size); chunk_unmap(src);
close(fd);
return success; return success;
} }
@@ -272,4 +253,3 @@ bool tnc_manager_register(plugin_t *plugin, plugin_feature_t *feature,
} }
return TRUE; return TRUE;
} }