JHUAPL/kvspool
1
0
Fork 0
mirror of https://github.com/JHUAPL/kvspool.git synced 2026-01-08 15:14:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix mac type

Browse Source
This commit is contained in:
Troy D. Hanson
2016-07-12 22:01:02 -04:00
parent 1b9d99d9cb
commit eb7da29652
5 changed files with 59 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/kvsp-bcat.c
View File

@@ -60,17 +60,17 @@ int set_to_binary(void *set, UT_string *tmp) {
utstring_bincpy(tmp,kv->val,kv->vlen); /* string itself */
break;
case mac:
if ((sscanf(kv->val,"%u:%u:%u:%u:%u:%u",&a,&b,&c,&d,&e,&f) != 6) ||
if ((sscanf(kv->val,"%x:%x:%x:%x:%x:%x",&a,&b,&c,&d,&e,&f) != 6) ||
(a > 255 || b > 255 || c > 255 || d > 255 || e > 255 || f > 255)) {
fprintf(stderr,"invalid MAC for key %s: %s\n",*k,kv->val);
goto done;
}
utstring_bincpy(tmp,&a,sizeof(a));
utstring_bincpy(tmp,&b,sizeof(b));
utstring_bincpy(tmp,&c,sizeof(c));
utstring_bincpy(tmp,&d,sizeof(d));
utstring_bincpy(tmp,&e,sizeof(e));
utstring_bincpy(tmp,&f,sizeof(f));
g=a; utstring_bincpy(tmp,&g,sizeof(g));
g=b; utstring_bincpy(tmp,&g,sizeof(g));
g=c; utstring_bincpy(tmp,&g,sizeof(g));
g=d; utstring_bincpy(tmp,&g,sizeof(g));
g=e; utstring_bincpy(tmp,&g,sizeof(g));
g=f; utstring_bincpy(tmp,&g,sizeof(g));
break;
case ipv4:
if ((sscanf(kv->val,"%u.%u.%u.%u",&a,&b,&c,&d) != 4) ||

2
utils/kvsp-bconfig.h
View File

@@ -7,6 +7,8 @@ extern UT_array /* of string */ *output_keys;
extern UT_array /* of string */ *output_defaults;
extern UT_array /* of int */ *output_types;
int parse_config(char *);
extern char *supported_types_str[];
#define TYPES x(i16) x(i32) x(ipv4) x(str) x(i8) x(d64) x(mac)

14
utils/kvsp-bpub.c
View File

@@ -74,17 +74,17 @@ int set_to_binary(void *set, zmq_msg_t *part) {
utstring_bincpy(tmp,kv->val,kv->vlen); /* string itself */
break;
case mac:
if ((sscanf(kv->val,"%u:%u:%u:%u:%u:%u",&a,&b,&c,&d,&e,&f) != 6) ||
if ((sscanf(kv->val,"%x:%x:%x:%x:%x:%x",&a,&b,&c,&d,&e,&f) != 6) ||
(a > 255 || b > 255 || c > 255 || d > 255 || e > 255 || f > 255)) {
fprintf(stderr,"invalid MAC for key %s: %s\n",*k,kv->val);
goto done;
}
utstring_bincpy(tmp,&a,sizeof(a));
utstring_bincpy(tmp,&b,sizeof(b));
utstring_bincpy(tmp,&c,sizeof(c));
utstring_bincpy(tmp,&d,sizeof(d));
utstring_bincpy(tmp,&e,sizeof(e));
utstring_bincpy(tmp,&f,sizeof(f));
g=a; utstring_bincpy(tmp,&g,sizeof(g));
g=b; utstring_bincpy(tmp,&g,sizeof(g));
g=c; utstring_bincpy(tmp,&g,sizeof(g));
g=d; utstring_bincpy(tmp,&g,sizeof(g));
g=e; utstring_bincpy(tmp,&g,sizeof(g));
g=f; utstring_bincpy(tmp,&g,sizeof(g));
break;
case ipv4:
if ((sscanf(kv->val,"%u.%u.%u.%u",&a,&b,&c,&d) != 4) ||

14
utils/kvsp-npub.c
View File

@@ -65,17 +65,17 @@ int set_to_binary(void *set) {
utstring_bincpy(tmp,kv->val,kv->vlen); /* string itself */
break;
case mac:
if ((sscanf(kv->val,"%u:%u:%u:%u:%u:%u",&a,&b,&c,&d,&e,&f) != 6) ||
if ((sscanf(kv->val,"%x:%x:%x:%x:%x:%x",&a,&b,&c,&d,&e,&f) != 6) ||
(a > 255 || b > 255 || c > 255 || d > 255 || e > 255 || f > 255)) {
fprintf(stderr,"invalid MAC for key %s: %s\n",*k,kv->val);
goto done;
}
utstring_bincpy(tmp,&a,sizeof(a));
utstring_bincpy(tmp,&b,sizeof(b));
utstring_bincpy(tmp,&c,sizeof(c));
utstring_bincpy(tmp,&d,sizeof(d));
utstring_bincpy(tmp,&e,sizeof(e));
utstring_bincpy(tmp,&f,sizeof(f));
g=a; utstring_bincpy(tmp,&g,sizeof(g));
g=b; utstring_bincpy(tmp,&g,sizeof(g));
g=c; utstring_bincpy(tmp,&g,sizeof(g));
g=d; utstring_bincpy(tmp,&g,sizeof(g));
g=e; utstring_bincpy(tmp,&g,sizeof(g));
g=f; utstring_bincpy(tmp,&g,sizeof(g));
break;
case ipv4:
if ((sscanf(kv->val,"%u.%u.%u.%u",&a,&b,&c,&d) != 4) ||

72
utils/kvsp-tpub.c
View File

@@ -71,6 +71,35 @@ void discard_client_buffers(int pos) {
utarray_erase(cfg.clients,pos,1); // erase client descriptor
}
int new_epoll(int events, int fd) {
int rc;
struct epoll_event ev;
memset(&ev,0,sizeof(ev)); // placate valgrind
ev.events = events;
ev.data.fd= fd;
if (cfg.verbose) fprintf(stderr,"adding fd %d to epoll\n", fd);
rc = epoll_ctl(cfg.epoll_fd, EPOLL_CTL_ADD, fd, &ev);
if (rc == -1) {
fprintf(stderr,"epoll_ctl: %s\n", strerror(errno));
}
return rc;
}
int mod_epoll(int events, int fd) {
int rc;
struct epoll_event ev;
memset(&ev,0,sizeof(ev)); // placate valgrind
ev.events = events;
ev.data.fd= fd;
if (cfg.verbose) fprintf(stderr,"modding fd %d epoll\n", fd);
rc = epoll_ctl(cfg.epoll_fd, EPOLL_CTL_MOD, fd, &ev);
if (rc == -1) {
fprintf(stderr,"epoll_ctl: %s\n", strerror(errno));
}
return rc;
}
void mark_writable() {
/* mark writability-interest for any clients with pending output */
int *fd=NULL, *i=NULL;
@@ -115,17 +144,17 @@ int set_to_binary(void *set, UT_string *bin) {
utstring_bincpy(bin,kv->val,kv->vlen); /* string itself */
break;
case mac:
if ((sscanf(kv->val,"%u:%u:%u:%u:%u:%u",&a,&b,&c,&d,&e,&f) != 6) ||
if ((sscanf(kv->val,"%x:%x:%x:%x:%x:%x",&a,&b,&c,&d,&e,&f) != 6) ||
(a > 255 || b > 255 || c > 255 || d > 255 || e > 255 || f > 255)) {
fprintf(stderr,"invalid MAC for key %s: %s\n",*k,kv->val);
goto done;
}
utstring_bincpy(bin,&a,sizeof(a));
utstring_bincpy(bin,&b,sizeof(b));
utstring_bincpy(bin,&c,sizeof(c));
utstring_bincpy(bin,&d,sizeof(d));
utstring_bincpy(bin,&e,sizeof(e));
utstring_bincpy(bin,&f,sizeof(f));
g=a; utstring_bincpy(bin,&g,sizeof(g));
g=b; utstring_bincpy(bin,&g,sizeof(g));
g=c; utstring_bincpy(bin,&g,sizeof(g));
g=d; utstring_bincpy(bin,&g,sizeof(g));
g=e; utstring_bincpy(bin,&g,sizeof(g));
g=f; utstring_bincpy(bin,&g,sizeof(g));
break;
case ipv4:
if ((sscanf(kv->val,"%u.%u.%u.%u",&a,&b,&c,&d) != 4) ||
@@ -371,35 +400,6 @@ void feed_client(int ready_fd, int events) {
#endif
}
int new_epoll(int events, int fd) {
int rc;
struct epoll_event ev;
memset(&ev,0,sizeof(ev)); // placate valgrind
ev.events = events;
ev.data.fd= fd;
if (cfg.verbose) fprintf(stderr,"adding fd %d to epoll\n", fd);
rc = epoll_ctl(cfg.epoll_fd, EPOLL_CTL_ADD, fd, &ev);
if (rc == -1) {
fprintf(stderr,"epoll_ctl: %s\n", strerror(errno));
}
return rc;
}
int mod_epoll(int events, int fd) {
int rc;
struct epoll_event ev;
memset(&ev,0,sizeof(ev)); // placate valgrind
ev.events = events;
ev.data.fd= fd;
if (cfg.verbose) fprintf(stderr,"modding fd %d epoll\n", fd);
rc = epoll_ctl(cfg.epoll_fd, EPOLL_CTL_MOD, fd, &ev);
if (rc == -1) {
fprintf(stderr,"epoll_ctl: %s\n", strerror(errno));
}
return rc;
}
int handle_signal() {
int rc=-1;
struct signalfd_siginfo info;