ust: improve message parsing

[ust.git] / libustcomm / ustcomm.c

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 0275a736b99a22b7f4b82304f5c289ca2544446d..c944214ae2ea93aec91febf836e6b8018bc873d5 100644 (file)
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -20,14 +20,14 @@
 
 #define MSG_MAX 1000
 
-static void bt(void)
-{
-       void *buffer[100];
-       int result;
-
-       result = backtrace(&buffer, 100);
-       backtrace_symbols_fd(buffer, result, STDERR_FILENO);
-}
+//static void bt(void)
+//{
+//     void *buffer[100];
+//     int result;
+//
+//     result = backtrace(&buffer, 100);
+//     backtrace_symbols_fd(buffer, result, STDERR_FILENO);
+//}
 
 static void signal_process(pid_t pid)
 {
@@ -124,19 +124,32 @@ int ustcomm_request_consumer(pid_t pid, const char *channel)
 
        asprintf(&msg, "collect %d %s", pid, channel); 
 
-       send_message_path(path, msg, NULL, pid);
+       send_message_path(path, msg, NULL, -1);
        free(msg);
 
        return 0;
 }
 
-static int recv_message_fd(int fd, char **msg)
+static int recv_message_fd(int fd, char **msg, struct ustcomm_source *src)
 {
        int result;
-       struct sockaddr_un addr;
+       size_t initial_addrlen,addrlen;
 
        *msg = (char *) malloc(MSG_MAX+1);
-       result = recvfrom(fd, *msg, MSG_MAX, 0, NULL, NULL);
+
+       if(src) {
+               initial_addrlen = addrlen = sizeof(src->addr);
+
+               result = recvfrom(fd, *msg, MSG_MAX, 0, &src->addr, &addrlen);
+               if(initial_addrlen != addrlen) {
+                       ERR("recvfrom: unexpected address length");
+                       return -1;
+               }
+       }
+       else {
+               result = recvfrom(fd, *msg, MSG_MAX, 0, NULL, NULL);
+       }
+
        if(result == -1) {
                PERROR("recvfrom");
                return -1;
@@ -146,19 +159,17 @@ static int recv_message_fd(int fd, char **msg)
        
        DBG("ustcomm_app_recv_message: result is %d, message is %s", result, (*msg));
 
-       bt();
-
        return 0;
 }
 
-int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg)
+int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustcomm_source *src)
 {
-       return recv_message_fd(ustd->fd, msg);
+       return recv_message_fd(ustd->fd, msg, src);
 }
 
-int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg)
+int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg, struct ustcomm_source *src)
 {
-       return recv_message_fd(app->fd, msg);
+       return recv_message_fd(app->fd, msg, src);
 }
 
 static int init_named_socket(char *name, char **path_out)
@@ -224,9 +235,104 @@ free_name:
 
 int ustcomm_init_ustd(struct ustcomm_ustd *handle)
 {
-       handle->fd = init_named_socket("ustd", &handle->socketpath);
+       int result;
+       char *name;
+
+       result = asprintf(&name, "%s/%s", SOCK_DIR, "ustd");
+       if(result >= UNIX_PATH_MAX) {
+               ERR("string overflow allocating socket name");
+               return -1;
+       }
+
+       handle->fd = init_named_socket(name, &handle->socketpath);
        if(handle->fd < 0)
                return handle->fd;
+       free(name);
 
        return 0;
 }
+
+char *find_tok(const char *str)
+{
+       while(*str == ' ') {
+               str++;
+
+               if(*str == 0)
+                       return NULL;
+       }
+
+       return str;
+}
+
+static char *find_sep(char *str)
+{
+       while(*str != ' ') {
+               str++;
+
+               if(*str == 0)
+                       break;
+       }
+
+       return str;
+}
+
+int nth_token_is(char *str, char *token, int tok_no)
+{
+       int i;
+       char *start;
+       char *end;
+
+       for(i=0; i<=tok_no; i++) {
+               str = find_tok(str);
+               if(str == NULL)
+                       return -1;
+
+               start = str;
+
+               str = find_sep(str);
+               if(str == NULL)
+                       return -1;
+
+               end = str;
+       }
+
+       if(end-start != strlen(token))
+               return 0;
+
+       if(strncmp(start, token, end-start))
+               return 0;
+
+       return 1;
+}
+
+char *nth_token(char *str, int tok_no)
+{
+       static char *retval = NULL;
+       int i;
+       char *start;
+       char *end;
+
+       for(i=0; i<=tok_no; i++) {
+               str = find_tok(str);
+               if(str == NULL)
+                       return NULL;
+
+               start = str;
+
+               str = find_sep(str);
+               if(str == NULL)
+                       return NULL;
+
+               end = str;
+       }
+
+       if(retval) {
+               free(retval);
+               retval = NULL;
+       }
+
+       retval = strndupa(start, end-start);
+
+       return retval;
+}
+