Changeset 026abfb in rtems-libbsd

Timestamp:

11/10/14 07:27:32 (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

e6405ea

Parents:

4153ebe

git-author:

Sebastian Huber <sebastian.huber@…> (11/10/14 07:27:32)

git-committer:

Sebastian Huber <sebastian.huber@…> (11/10/14 07:28:38)

Message:

Add rtems_mdns_gethostname()

Files:

• Makefile (modified) (1 diff)
• freebsd-to-rtems.py (modified) (1 diff)
• rtemsbsd/include/rtems/mdns.h (modified) (2 diffs)
• rtemsbsd/mdns/mdns-hostname-default.c (moved) (moved from rtemsbsd/mdns/mdns-sethostname-default.c) (1 diff)
• rtemsbsd/mdns/mdns.c (modified) (3 diffs)

Makefile

@@ -103 +103 @@
 LIB_C_FILES += rtemsbsd/ftpd/ftpd.c
 LIB_C_FILES += rtemsbsd/mdns/mdns.c
-LIB_C_FILES += rtemsbsd/mdns/mdns-sethostname-default.c
+LIB_C_FILES += rtemsbsd/mdns/mdns-hostname-default.c
 LIB_C_FILES += rtemsbsd/pppd/auth.c
 LIB_C_FILES += rtemsbsd/pppd/ccp.c

freebsd-to-rtems.py

@@ -701 +701 @@
                 'ftpd/ftpd.c',
                 'mdns/mdns.c',
-                'mdns/mdns-sethostname-default.c',
+                'mdns/mdns-hostname-default.c',
                 'pppd/auth.c',
                 'pppd/ccp.c',

rtemsbsd/include/rtems/mdns.h

@@ -42 +42 @@
 
 /* Private variable, do not touch.  Use rtems_mdns_sethostname() instead. */
-extern void (*rtems_mdns_sethostname_handler)(const char *hostname);
+extern int (*rtems_mdns_sethostname_handler)(const char *hostname);
+
+/* Private variable, do not touch.  Use rtems_mdns_gethostname() instead. */
+extern int (*rtems_mdns_gethostname_handler)(char *hostname, size_t size);
 
 /**
@@ -78 +81 @@
  *
  * @param[in] hostname The new multicast hostname.
+ *
+ * @retval 0 Successful operation.
+ * @retval -1 An error occurred.  The errno is set to indicate the error.
  */
-static inline void
+static inline int
 rtems_mdns_sethostname(const char *hostname)
 {
-  (*rtems_mdns_sethostname_handler)(hostname);
+  return (*rtems_mdns_sethostname_handler)(hostname);
+}
+
+/**
+ * @brief Gets the multicast hostname of the mDNS resolver instance.
+ *
+ * @param[in] hostname The multicast hostname buffer.
+ * @param[in] size The size of the multicast hostname buffer.
+ *
+ * @retval 0 Successful operation.
+ * @retval -1 An error occurred.  The errno is set to indicate the error.
+ */
+static inline int
+rtems_mdns_gethostname(char *hostname, size_t size)
+{
+  return (*rtems_mdns_gethostname_handler)(hostname, size);
 }
 

rtemsbsd/mdns/mdns-hostname-default.c

@@ -32 +32 @@
 #include <rtems/mdns.h>
 
-static void
+#include <errno.h>
+
+static int
 mdns_sethostname_default(const char *hostname)
 {
-        /* Do nothing */
+  (void)hostname;
+
+  errno = ENXIO;
+
+  return (-1);
 }
 
-void (*rtems_mdns_sethostname_handler)(const char *hostname) =
+static int
+mdns_gethostname_default(char *hostname, size_t size)
+{
+  (void)hostname;
+  (void)size;
+
+  errno = ENXIO;
+
+  return (-1);
+}
+
+int (*rtems_mdns_sethostname_handler)(const char *hostname) =
     mdns_sethostname_default;
+
+int (*rtems_mdns_gethostname_handler)(char *hostname, size_t size) =
+    mdns_gethostname_default;

rtemsbsd/mdns/mdns.c

@@ -276 +276 @@
 }
 
-static void
+static int
 mdns_sethostname(const char *hostname)
 {
@@ -291 +291 @@
 
         rtems_bsd_force_select_timeout(mdns_daemon_id);
+
+        return (0);
+}
+
+static int
+mdns_gethostname(char *hostname, size_t size)
+{
+        mDNS *m = &mDNSStorage;
+
+        if (size < MAX_ESCAPED_DOMAIN_LABEL) {
+                errno = ERANGE;
+
+                return (-1);
+        }
+
+        mDNS_Lock(m);
+
+        ConvertDomainLabelToCString(&m->hostlabel, hostname);
+
+        mDNS_Unlock(m);
+
+        return (0);
 }
 
@@ -344 +366 @@
 
         rtems_mdns_sethostname_handler = mdns_sethostname;
+        rtems_mdns_gethostname_handler = mdns_gethostname;
 
         return (RTEMS_SUCCESSFUL);