Merge branch 'devel'

Author: michalvasko

src/messages_server.c

@@ -16,6 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <stdbool.h>
 
 #include <libyang/libyang.h>
 
@@ -828,6 +829,7 @@ nc_server_notif_new(struct lyd_node* event, char *eventtime, NC_PARAMTYPE paramt
 {
     struct nc_server_notif *ntf;
     struct lyd_node *elem;
+    bool found_notif = false;
 
     if (!event) {
         ERRARG("event");
@@ -838,7 +840,7 @@ nc_server_notif_new(struct lyd_node* event, char *eventtime, NC_PARAMTYPE paramt
     }
 
     /* check that there is a notification */
-    for (elem = event; elem && (elem->schema->nodetype != LYS_NOTIF); elem = elem->child) {
+    for (elem = event; elem && !found_notif; elem = elem->child) {
 next_node:
         switch (elem->schema->nodetype) {
         case LYS_LEAF:
@@ -852,16 +854,18 @@ nc_server_notif_new(struct lyd_node* event, char *eventtime, NC_PARAMTYPE paramt
             goto next_node;
         case LYS_CONTAINER:
         case LYS_LIST:
-        case LYS_NOTIF:
             /* ok */
             break;
+        case LYS_NOTIF:
+            found_notif = true;
+            break;
         default:
             /* error */
             ERRARG("event");
             return NULL;
         }
     }
-    if (!elem) {
+    if (!found_notif) {
         ERRARG("event");
         return NULL;
     }

src/session_server.c

@@ -369,9 +369,9 @@ nc_sock_accept_binds(struct nc_bind *binds, uint16_t bind_count, int timeout, ch
     /* host was requested */
     if (host) {
         if (saddr.ss_family == AF_INET) {
-            *host = malloc(15);
+            *host = malloc(INET_ADDRSTRLEN);
             if (*host) {
-                if (!inet_ntop(AF_INET, &((struct sockaddr_in *)&saddr)->sin_addr.s_addr, *host, 15)) {
+                if (!inet_ntop(AF_INET, &((struct sockaddr_in *)&saddr)->sin_addr.s_addr, *host, INET_ADDRSTRLEN)) {
                     ERR("inet_ntop failed (%s).", strerror(errno));
                     free(*host);
                     *host = NULL;
@@ -386,7 +386,7 @@ nc_sock_accept_binds(struct nc_bind *binds, uint16_t bind_count, int timeout, ch
         } else if (saddr.ss_family == AF_INET6) {
             *host = malloc(INET6_ADDRSTRLEN);
             if (*host) {
-                if (!inet_ntop(AF_INET6, ((struct sockaddr_in6 *)&saddr)->sin6_addr.s6_addr, *host, 40)) {
+                if (!inet_ntop(AF_INET6, ((struct sockaddr_in6 *)&saddr)->sin6_addr.s6_addr, *host, INET6_ADDRSTRLEN)) {
                     ERR("inet_ntop failed (%s).", strerror(errno));
                     free(*host);
                     *host = NULL;