Added a bit of debugging messages.

Merged task_proto and observe_proto into one protocol in munia_proto.

1 files changed, 0 insertions, 85 deletions

diff --git a/src/observe_proto.cc b/src/observe_proto.cc
deleted file mode 100644
index e8f78de..0000000
--- a/src/observe_proto.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set et sw=2 ts=2: */
-/***************************************************************************
- *            observe_proto.cc
- *
- *  Fri Mar 23 15:29:13 CET 2012
- *  Copyright 2012 Bent Bisballe Nyeng
- *  deva@aasimon.org
- ****************************************************************************/
-
-/*
- *  This file is part of Munia.
- *
- *  Munia is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  Munia is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Munia; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
- */
-#include "observe_proto.h"
-
-#include <stdio.h>
-#include <string.h>
-
-#include <queue>
-#include <map>
-
-#include "task.h"
-#include "messageparser.h"
-
-#include "connectionhandler.h"
-
-int callback_lws_observe(struct libwebsocket_context *context,
-                         struct libwebsocket *wsi,
-                         enum libwebsocket_callback_reasons reason,
-                         void *user, void *in, size_t len)
-{
-  switch (reason) {
-  case LWS_CALLBACK_ESTABLISHED:
-    connection_handler.init(wsi);
-    break;
-
-  case LWS_CALLBACK_CLOSED:
-    connection_handler.close(wsi);
-    break;
-
-  case LWS_CALLBACK_RECEIVE:
-    {
-      std::string data;
-      data.append((char*)in, len);
-
-      MessageList mlst = parse_msg(data);
-      for(MessageList::iterator i = mlst.begin(); i != mlst.end(); i++) {
-        message_t m = *i;
-        switch(m.cmd) {
-        case cmd::observe: {
-          connection_handler.observe(wsi, m.observe.id);
-          break;
-        }
-        case cmd::unobserve: {
-          connection_handler.unobserve(wsi, m.observe.id);
-          break;
-        }
-        default:
-          printf("Wrong command :(\n");
-          break;
-        }
-      }
-    }
-    break;
-
-  default:
-    break;
-  }
-
-  return 0;
-}