Changeset 560

Timestamp:

04/30/08 01:07:04 (2 weeks ago)

Author:

agr

Message:

NRK REBOOT ON ERROR fix

Files:

• nano-RK/projects/SAMPL/slip-clients/xmpp-client/lm-library.c (modified) (25 diffs)
• nano-RK/projects/SAMPL/slip-clients/xmpp-client/lm-library.h (modified) (6 diffs)
• nano-RK/src/kernel/source/nrk_error.c (modified) (3 diffs)

nano-RK/projects/SAMPL/slip-clients/xmpp-client/lm-library.c

@@ -1 +1 @@
-#include "lm-library.h"
-
-
+
+
+
+
-
-static GMainLoop *main_loop = NULL;
@@ -177 +180 @@
-        gpointer     ud)
-{
-
-
+
+
+
+
+
-  switch (status) {
-  case LM_SSL_STATUS_NO_CERT_FOUND:
@@ -204 +210 @@
-    break;
-  }
-
+
+
-  return LM_SSL_RESPONSE_CONTINUE;
-}
@@ -215 +222 @@
-  if (success) {
-    LmMessage *m;
-
+
+
-    g_print ("XMPP_Client: Authenticated successfully\n");
+#endif
-
-    init_success = TRUE;
@@ -224 +233 @@
-                                      LM_MESSAGE_SUB_TYPE_AVAILABLE);
-    lm_connection_send (connection, m, NULL);
-
-
+
+
+
+
+
-    lm_message_unref (m);
-
@@ -250 +262 @@
-                                NULL, FALSE,  NULL);
-    g_free (user);
-
-
+
+
+
+
+
-  } else {
-    g_printerr ("XMPP_Client: Failed to connect\n");
@@ -293 +308 @@
-                 gpointer          user_data)
-{
-
-
-
-
-
-
+
+
+
-
-  if( (lm_message_get_type(m) == LM_MESSAGE_TYPE_MESSAGE) && 
@@ -307 +319 @@
-}
-
-
-XMPPResult create_event_node (gchar *nodeID, 
-                              GSList *collectionList, 
-                              gboolean isCollection)
+{
+  return create_event_node_with_desc (nodeID,"default",collectionList,isCollection);
+}
+
+
+XMPPResult create_event_node_with_desc (gchar *nodeID,
+                                        gchar *desc,
+                                        GSList *collectionList, 
+                                        gboolean isCollection)
-{
-  LmMessage *m,*reply;
@@ -344 +364 @@
-                                     ')',
-                                     ')',
+                                     '(', "field", "",
+                                     '@', "var", "pubsub#title",
+                                     '(', "value", desc,
+                                     ')',
+                                     ')',
-                                     ')',
-                                     ')',
@@ -481 +506 @@
-  
-  reply = lm_connection_send_with_reply_and_block(connection,m,&error);
-
+
-  lm_message_unref(m);
-  
@@ -543 +568 @@
-                                     '@', "xmlns", "http://jabber.org/protocol/disco#items",
-                                     ')', NULL);
-
+
+
+
+
+
-  reply = lm_connection_send_with_reply_and_block(connection,m,&error);
+
+#ifdef DEBUG
+  g_print("Reply get_node_list msg:\n%s\n",lm_message_node_to_string(reply->node));
+#endif
-
-  lm_message_unref (m);  
@@ -559 +592 @@
-    child = lm_message_node_find_child(reply->node,"query");
-    if(child == NULL) {
-
+XMPP_Client: 
-      lm_message_unref(reply);
-      return NULL;
@@ -566 +599 @@
-    child = child->children;
-    if(child == NULL) {
-
+XMPP_Client: 
-      lm_message_unref(reply);
-      return NULL;
@@ -573 +606 @@
-    while(child != NULL) {
-      NodeDesc *node = g_new0 (NodeDesc, 1);
-node->name = (gchar*) lm_message_node_get_attribute(child,"node"
-node->desc = (gchar*) lm_message_node_get_attribute(child,"name"
+strcpy(node->name, (gchar*) lm_message_node_get_attribute(child,"node")
+strcpy(node->desc, (gchar*) lm_message_node_get_attribute(child,"name")
-      node_list = g_slist_prepend (node_list, node);
-      child = child->next;
@@ -580 +613 @@
-  }
-  else {
-
+XMPP_Client: 
-    lm_message_unref(reply);
-    return NULL;
-  }
-
+  lm_message_unref(reply);
+  return node_list;
+}
+
+GSList* get_all_current_subscriptions(void)
+{
+  LmMessage *m, *reply;
+  GError *error = NULL;
+  GSList *node_list = NULL;
+  LmMessageNode *child = NULL;
+
+  if(connection == NULL)
+    return NULL;
+
+  m = lm_message_build_with_sub_type(_pubsub_server, LM_MESSAGE_TYPE_IQ, LM_MESSAGE_SUB_TYPE_SET,
+                                     '(', "pubsub", "",
+                                     '@', "xmlns", PUBSUB_NS,
+                                     '(', "subscriptions", "",
+                                     ')',
+                                     ')', NULL);
+
+  lm_message_node_set_attribute(m->node,"from",username);
+
+#ifdef DEBUG
+  g_print("get_all_subscriptions message: %s\n",lm_message_node_to_string(m->node));
+#endif
+
+  reply = lm_connection_send_with_reply_and_block(connection,m,&error);
+
+#ifdef DEBUG
+  g_print("get_all_subscriptions reply: %s\n",lm_message_node_to_string(reply->node));
+#endif
+
+  lm_message_unref (m);
+
+  if(error != NULL) {
+    g_printerr ("XMPP_Client: Failed to get all subscriptions: error:%d->'%s'\n",error->code,error->message);
+    g_free(error);
+    goto finish;
+    
+    //lm_message_unref(reply);
+    //return NULL;
+  }
+
+  if(lm_message_get_type(reply) == LM_MESSAGE_TYPE_IQ && lm_message_get_sub_type(reply) == LM_MESSAGE_SUB_TYPE_ERROR) {
+    LmMessageNode *child = lm_message_node_find_child(reply->node,"error");
+    const gchar* attr = lm_message_node_get_attribute(child,"type");
+    
+    g_printerr ("get_all_subscriptions Error: <%s,%s>\n",attr,child->children->name);
+
+    goto finish;
+
+    //lm_message_unref(reply);
+    //return NULL;      
+  }
+  else if(lm_message_get_type(reply) == LM_MESSAGE_TYPE_IQ && lm_message_get_sub_type(reply) == LM_MESSAGE_SUB_TYPE_RESULT) {
+    child = lm_message_node_find_child(reply->node,"subscriptions");
+    if(child == NULL) {
+      g_printerr ("XMPP_Client get_subscriptions: could not find subscriptions in message\n");
+      goto finish;
+      //lm_message_unref(reply);
+      //return NULL;
+    }
+    
+    child = child->children;
+    if(child == NULL) {
+      g_print("XMPP_Client get_subscriptions: no items in result\n");
+      goto finish;
+      //lm_message_unref(reply);
+      //return NULL;
+    }
+
+    while(child != NULL) {
+      //NodeDesc *tmp = NULL;
+      NodeDesc *node = g_new0 (NodeDesc, 1);
+      strcpy(node->name,(gchar*) lm_message_node_get_attribute(child,"node"));
+      strcpy(node->desc,(gchar*) lm_message_node_get_attribute(child,"subscription"));
+      node_list = g_slist_prepend (node_list, node);
+      //tmp = (NodeDesc*)node_list->data;
+      //g_print("subscription node=%s desc=%s\n",tmp->name, tmp->desc);
+      child = child->next;
+    }
+  }
+
+finish:
+  lm_message_unref(reply);
-  return node_list;
-}
@@ -606 +725 @@
-                                     ')', NULL);
-
+  lm_message_node_set_attribute(m->node,"from",username);
+
+#ifdef DEBUG
+  g_print("sub message: %s\n",lm_message_node_to_string(m->node));
+#endif
+
-  reply = lm_connection_send_with_reply_and_block(connection,m,&error);
+
+#ifdef DEBUG
+  g_print("sub reply: %s\n",lm_message_node_to_string(reply->node));
+#endif
-
-  lm_message_unref (m);
@@ -630 +759 @@
-    else if(strcmp(attr,"auth")==0)
-      ret = XMPP_ERROR_NOT_AUTHORISED;
-
+
+
+
-    lm_message_unref(reply);
-    return ret;      
@@ -640 +771 @@
-}
-
+XMPPResult unsubscribe_from_node(gchar *nodeID)
+{
+  LmMessage *m, *reply;
+  GError *error = NULL;
+ 
+  if(connection == NULL)
+    return XMPP_ERROR_NOT_INITIALIZED;
+ 
+  m = lm_message_build_with_sub_type(_pubsub_server, LM_MESSAGE_TYPE_IQ, LM_MESSAGE_SUB_TYPE_SET,
+                                     '(', "pubsub", "",
+                                     '@', "xmlns", PUBSUB_NS,
+                                     '(', "unsubscribe", "",
+                                     '@', "node", nodeID,
+                                     '@', "jid", username,
+                                     ')',
+                                     ')', NULL);
+
+#ifdef DEBUG
+  g_print("unsub message: %s\n",lm_message_node_to_string(m->node));
+#endif
+
+  reply = lm_connection_send_with_reply_and_block(connection,m,&error);
+
+#ifdef DEBUG
+  g_print("unsub reply: %s\n",lm_message_node_to_string(reply->node));
+#endif
+
+  lm_message_unref (m);
+
+  if(error != NULL) {
+    g_printerr ("XMPP_Client: Failed to send unsubscribe message: error:%d->'%s'\n",error->code,error->message);
+    g_free(error);
+    lm_message_unref(reply);
+    return XMPP_ERROR_UNKNOWN;
+  }
+
+  if(lm_message_get_type(reply) == LM_MESSAGE_TYPE_IQ && lm_message_get_sub_type(reply) == LM_MESSAGE_SUB_TYPE_ERROR) {
+    LmMessageNode *child = lm_message_node_find_child(reply->node,"error");
+    const gchar* attr = lm_message_node_get_attribute(child,"type");
+    XMPPResult ret = XMPP_ERROR_UNKNOWN;
+    
+    if(strcmp(attr,"modify")==0) {
+      if(strcmp(child->children->name,"subid-required")==0)
+        ret = XMPP_ERROR_MULTIPLE_SUBSCRIPTIONS;
+      else if(strcmp(child->children->name,"bad-request")==0)
+        ret = XMPP_ERROR_MULTIPLE_SUBSCRIPTIONS;
+    }
+    else if(strcmp(attr,"cancel")==0) {
+      if(strcmp(child->children->name,"unexpected-request")==0)
+        ret = XMPP_ERROR_NOT_SUBSCRIBED;
+      else if(strcmp(child->children->name,"not-subscribed")==0)
+        ret = XMPP_ERROR_NOT_SUBSCRIBED;      
+      else if(strcmp(child->children->name,"item-not-found")==0)
+        ret = XMPP_ERROR_NODE_DOESNT_EXIST;
+    }
+    else if(strcmp(attr,"auth")==0)
+      ret = XMPP_ERROR_NOT_AUTHORISED;
+    else if(strcmp(attr,"wait")==0)
+      ret = XMPP_ERROR_NOT_SUBSCRIBED;
+    else {
+      g_print("XMPP_Client: Unknown unsubscribe Error: <%s,%s>\n",attr,child->children->name);
+    }
+    lm_message_unref(reply);
+    return ret;      
+  }
+  
+  lm_message_unref(reply);
+  
+  return XMPP_NO_ERROR;  
+}
+
+XMPPResult add_publisher_to_node(gchar *nodeID, gchar *user)
+{
+  LmMessage *m, *reply;
+  GError *error = NULL;
+
+  if(connection == NULL)
+    return XMPP_ERROR_NOT_INITIALIZED;
+  
+  m = lm_message_build_with_sub_type(_pubsub_server, LM_MESSAGE_TYPE_IQ, LM_MESSAGE_SUB_TYPE_SET, 
+                                     '(', "pubsub", "",
+                                     '@', "xmlns", "http://jabber.org/protocol/pubsub#owner",
+                                     '(', "affiliations", "",
+                                     '@', "node", nodeID,
+                                     '(', "affiliation", "",
+                                     '@', "jid", user,
+                                     '@', "affiliation", "publisher",
+                                     ')',
+                                     ')',
+                                     ')', NULL);
+
+#ifdef DEBUG
+  g_print("XMPP_Client: add_publisher message: %s\n",lm_message_node_to_string(m->node));
+#endif
+
+  reply = lm_connection_send_with_reply_and_block(connection,m,&error);
+
+#ifdef DEBUG
+  g_print("XMPP_Client: reply to add_publisher message: %s\n",lm_message_node_to_string(reply->node));
+#endif
+
+  lm_message_unref (m);
+
+  if(error != NULL) {
+    g_printerr ("XMPP_Client: Failed to send add_publisher message: error:%d->'%s'\n",error->code,error->message);
+    lm_message_unref(reply);
+    g_free(error);
+    return XMPP_ERROR_UNKNOWN;
+  }
+
+  if(lm_message_get_type(reply) == LM_MESSAGE_TYPE_IQ && lm_message_get_sub_type(reply) == LM_MESSAGE_SUB_TYPE_ERROR) {
+    LmMessageNode *child = lm_message_node_find_child(reply->node,"error");
+    const gchar* attr = lm_message_node_get_attribute(child,"type");
+    XMPPResult ret = XMPP_ERROR_UNKNOWN;
+    
+    if(strcmp(attr,"cancel")==0) {
+      if(strcmp(child->children->name,"item-not-found")==0)
+        ret = XMPP_ERROR_NODE_DOESNT_EXIST;
+      else
+        ret = XMPP_ERROR_NOT_SUPPORTED;
+    }
+    else if(strcmp(attr,"auth")==0)
+      ret = XMPP_ERROR_NOT_AUTHORISED;
+    
+    lm_message_unref(reply);
+    return ret;
+  }
+  
+  lm_message_unref(reply);
+  
+  return XMPP_NO_ERROR;
+}
-
-XMPPResult publish_to_node (gchar *nodeID, gchar *event)
@@ -658 +921 @@
-                                     ')',
-                                     ')', NULL);
-
+
+
+
+
+
-  reply = lm_connection_send_with_reply_and_block(connection,m,&error);
+
+#ifdef DEBUG
+  g_print("XMPP_Client: reply to publish message: %s\n",lm_message_node_to_string(reply->node));
+#endif
-
-  lm_message_unref (m);
@@ -687 +958 @@
-    
-    lm_message_unref(reply);
-      
+
-  }
-  
@@ -727 +998 @@
-  _pubsub_server = pubsub_server;
-
+#ifdef DEBUG
+  g_print("XMPP_Client: start_xmpp_client\n");
+#endif
+
-  connection = lm_connection_new (xmpp_server);
+
+#ifdef DEBUG
+  g_print("XMPP_Client: created new connection\n");
+#endif
+
+  //Set keep alive rate to 60 seconds
+  lm_connection_set_keep_alive_rate (connection, 60);
-  lm_connection_set_port (connection, xmpp_server_port);
-  lm_connection_set_jid (connection, username);
-
+
+
+
+
+
-  handler = lm_message_handler_new (handle_messages, NULL, NULL);
-  lm_connection_register_message_handler (connection, handler, 
@@ -738 +1024 @@
-                                          LM_MESSAGE_TYPE_IQ, 
-                                          LM_HANDLER_PRIORITY_NORMAL);
-
+
-  lm_message_handler_unref (handler);
-  
@@ -745 +1031 @@
-                                         NULL, NULL);
-
-
+
+
+
+
+
-    LmSSL *ssl;
-    char  *p;
@@ -766 +1056 @@
-    lm_ssl_unref (ssl);
-  }
-
+
+
+
+
+
-  result = lm_connection_open (connection,
-                               (LmResultFunction) connection_open_cb,
@@ -778 +1072 @@
-  }
-
+#ifdef DEBUG
+  g_print("XMPP_Client: creating main loop\n");
+#endif
+
-  main_loop = g_main_loop_new (NULL, FALSE);
+  g_main_loop_ref(main_loop);
-  g_main_loop_run (main_loop);
+  g_main_loop_unref(main_loop);
+
+#ifdef DEBUG
+  g_print("XMPP_Client: finished loop\n");
+#endif
-
-  if(!init_success)

nano-RK/projects/SAMPL/slip-clients/xmpp-client/lm-library.h

@@ -2 +2 @@
-#define __LM_LIBRARY_H__
-
+/*! \file lm-library.h
+    \brief XMPP Library API
+
+    This file contains the API to be used by applications
+    working with the XMPP framework.
+*/
+
-#include <string.h>
-#include <stdlib.h>
@@ -8 +15 @@
-#include <loudmouth/loudmouth.h>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-typedef enum {
-  XMPP_NO_ERROR = 0,
@@ -29 +43 @@
-  XMPP_ERROR_PASSWORD_IS_NULL,
-  XMPP_ERROR_ARGUMENT_IS_NULL,
+  XMPP_ERROR_MULTIPLE_SUBSCRIPTIONS,
+  XMPP_ERROR_NOT_SUBSCRIBED,
-  XMPP_ERROR_UNKNOWN
-} XMPPResult;
-
+/*! \struct XMPPErrorMessage
+    \brief Definiton of Error Struct
+
+   Used to map error codes to error messages
+*/
-static struct XMPPErrorMessage {
-  XMPPResult error_code;
@@ -41 +62 @@
-  { XMPP_ERROR_NOT_REGISTERED,                     "Need to be registered with service to perform specified action" },
-  { XMPP_ERROR_NODE_EXISTS,                        "Node ID exists" },
-ion
+ed
-  { XMPP_ERROR_MULTIPLE_PARENTS_NOT_ALLOWED,       "PubSub Service does not support multiple node parents" },
-  { XMPP_ERROR_NOT_COLLECTION_NODE,                "Specified node is not a collection node" },
@@ -51 +72 @@
-  { XMPP_ERROR_PASSWORD_IS_NULL,                   "Password is NULL" },
-  { XMPP_ERROR_ARGUMENT_IS_NULL,                   "Argument is NULL" },
+  { XMPP_ERROR_MULTIPLE_SUBSCRIPTIONS,             "Multiple subscriptions exist from jid to node" },
+  { XMPP_ERROR_NOT_SUBSCRIBED,                     "Not subscribed to node" },
-  { XMPP_ERROR_UNKNOWN,                            "Unknown Error" }
-};
-
+/*! \def ERROR_MESSAGE(a)
+    \brief a macro that returns error description of an error code
+*/
-#define ERROR_MESSAGE(a) error_desc[a].error_message
-
-G_BEGIN_DECLS
-
+/*! \var tpedef void (* XMPPMessageHandler) (LmMessage *message)
+    \brief type definition for a XMPP message handler
+*/
-typedef void (* XMPPMessageHandler) (LmMessage *message);
-
-G_END_DECLS
-
+/*! \struct NodeDesc
+    \brief struct for node details
+
+    NodeDesc is used to describe nodes. It is used in lists of event nodes.
+*/
-typedef struct {
-
-
+
+
+
+
-} NodeDesc;
-
+/*! \fn XMPPResult create_event_node(gchar *nodeID, 
+                                     GSList* collectionList, 
+                                     gboolean isCollection);
+    \brief Create an event node
+    \param nodeID ID of event node to create
+    \param collectionList List of IDs of nodes of which this node will be a child
+    \param isCollection specify if this node is a collection or a leaf
+    \return Result Code
+*/
-XMPPResult create_event_node(gchar *nodeID, 
-NodeID
+List
-                             gboolean isCollection);
-
+/*! \fn XMPPResult create_event_node_with_desc(gchar *nodeID,
+                                               gchar *desc,
+                                               GSList* collectionList, 
+                                               gboolean isCollection);
+    \brief Create an event node with a specified description
+    \param nodeID ID of event node to create
+    \param desc Description of event node
+    \param collectionList List of IDs of event nodes of which this event node will be a child
+    \param isCollection specify if this event node is a collection or a leaf
+    \return Result Code
+*/
+XMPPResult create_event_node_with_desc(gchar *nodeID, 
+                                       gchar *desc,
+                                       GSList* collectionList, 
+                                       gboolean isCollection);
+
+/*! \fn XMPPResult delete_event_node(gchar *nodeID)
+    \brief Delete an event node
+    \param nodeID ID of event node to delete
+    \return Result Code
+*/
-XMPPResult delete_event_node(gchar *nodeID);
-
+/*! \fn XMPPResult add_node_to_collection(gchar* nodeID, 
+                                          gchar* collectionID)
+    \brief Add event node to a collection node
+    \param nodeID ID of event node
+    \param collectionID ID of event node to attach as parent
+    \return Result code
+*/
-XMPPResult add_node_to_collection(gchar* nodeID, 
-
-
+
+
+
+
+
+
+
+
+
-XMPPResult remove_node_from_collection(gchar *nodeID, 
-
-
+
+
+
+
+
+
-GSList* get_node_list(void);
-
+/*! \fn XMPPResult subscribe_to_node(gchar *nodeID)
+    \brief Subscribe to event node
+    \param nodeID ID of event node to subscribe to
+    \return Result code
+*/
-XMPPResult subscribe_to_node(gchar *nodeID);
-
+/*! \fn XMPPResult unsubscribe_from_node(gchar *nodeID)
+    \brief Unsubscribe from event node
+    \param nodeID ID of event node to unsubscribe from
+    \return Result Code
+*/
-XMPPResult unsubscribe_from_node(gchar *nodeID);
-
+/*! \fn XMPPResult publish_to_node(gchar *nodeID, gchar* event)
+    \brief Publish data to node
+    \param nodeID ID of event node to publish to
+    \param event Data to send to node
+    \return Result Code
+*/                               
-XMPPResult publish_to_node(gchar *nodeID, 
-                           gchar *event);
-
+/*! \fn GSList* get_all_current_subscriptions(void)
+    \brief Get all event node subscriptions of current user
+    \return List of event nodes to which user is subscribed. NULL if no such nodes exist.
+*/
+GSList* get_all_current_subscriptions(void);
+
+/*! \fn XMPPResult add_publisher_to_node(gchar* nodeID, gchar* user)
+    \brief Add a JID as an allowed publisher to an event node
+    \param nodeID event node ID to add publisher to
+    \param user Full JID of user to add as publisher
+    \return Result code
+*/
+XMPPResult add_publisher_to_node(gchar *nodeID, gchar *user); 
+
+/*! \fn start_xmpp_client(const gchar *user_name, 
+                             const gchar *pass_word, 
+                             const gchar *xmpp_server, 
+                             const int xmpp_server_port, 
+                             const gchar *xmpp_server_fingerprint, 
+                             const gchar *pubsub_server, 
+                             XMPPMessageHandler user_handler)
+    \brief Start XMPP Client
+    \param user_name JID of user. format is user\@domain
+    \param pass_word password associated with JID
+    \param xmpp_server name of XMPP server. Usually domain of JID.
+    \param xmpp_server_port Port of server to connect to. Normally 5223
+    \param xmpp_server_fingerprint SSL Fingerprint of XMPP server
+    \param pubsub_server PubSub Service address. Usually pubsub.domain
+    \param user_handler Message handler to call when XMPP messages are received
+    \return Result Code
+*/
-XMPPResult start_xmpp_client(const gchar *user_name, 
-                             const gchar *pass_word, 
@@ -96 +227 @@
-                             XMPPMessageHandler user_handler);
-
+
-#endif

nano-RK/src/kernel/source/nrk_error.c

@@ -79 +79 @@
-    return 0;
- 
-#ifndef NRK_REBOOT_ON_ERROR
-   #ifdef NRK_HALT_ON_ERROR
-
-
-
-
+
+
+
+
+
+
-   #endif 
-
+
-
-#ifdef NRK_HALT_AND_LOOP_ON_ERROR 
@@ -97 +98 @@
-     {
-    
-
-
-
-
-
-
-
-
-
+
+
+
-    printf ("%d", error_task);
-    nrk_kprintf (PSTR ("): "));
@@ -174 +169 @@
-#ifdef NRK_REBOOT_ON_ERROR
-  // wait for watchdog to kick in
-
+
+
-  while(1);
-#endif