CMakeLists: set no-dangling-pointer

[project/uqmi.git] / main.c

diff --git a/main.c b/main.c
index f2f2e18685d7f0774dabbd550660dab395426b1d..aa4634c40fd18abb784528d318212c1710e0f1b1 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,3 +1,24 @@
+/*
+ * uqmi -- tiny QMI support implementation
+ *
+ * Copyright (C) 2014-2015 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ */
+
 #include <libubox/uloop.h>
 #include <libubox/utils.h>
 #include <stdio.h>
@@ -18,9 +39,12 @@ static const char *device;
 #define __uqmi_command(_name, _optname, _arg, _option) { #_optname, _arg##_argument, NULL, CMD_OPT(__UQMI_COMMAND_##_name) }
 static const struct option uqmi_getopt[] = {
        __uqmi_commands,
+       { "single", no_argument, NULL, 's' },
        { "device", required_argument, NULL, 'd' },
        { "keep-client-id", required_argument, NULL, 'k' },
        { "release-client-id", required_argument, NULL, 'r' },
+       { "mbim",  no_argument, NULL, 'm' },
+       { "timeout", required_argument, NULL, 't' },
        { NULL, 0, NULL, 0 }
 };
 #undef __uqmi_command
@@ -29,22 +53,28 @@ static int usage(const char *progname)
 {
        fprintf(stderr, "Usage: %s <options|actions>\n"
                "Options:\n"
+               "  --single, -s:                     Print output as a single line (for scripts)\n"
                "  --device=NAME, -d NAME:           Set device name to NAME (required)\n"
                "  --keep-client-id <name>:          Keep Client ID for service <name>\n"
-               "                                    (implies --keep-client-id)\n"
                "  --release-client-id <name>:       Release Client ID after exiting\n"
+               "  --mbim, -m                        NAME is an MBIM device with EXT_QMUX support\n"
+               "  --timeout, -t                     response timeout in msecs\n"
                "\n"
                "Services:                           dms, nas, pds, wds, wms\n"
                "\n"
                "Actions:\n"
                "  --get-versions:                   Get service versions\n"
                "  --set-client-id <name>,<id>:      Set Client ID for service <name> to <id>\n"
+               "                                    (implies --keep-client-id)\n"
                "  --get-client-id <name>:           Connect and get Client ID for service <name>\n"
                "                                    (implies --keep-client-id)\n"
+               "  --sync:                           Release all Client IDs\n"
                wds_helptext
                dms_helptext
+               uim_helptext
                nas_helptext
                wms_helptext
+               wda_helptext
                "\n", progname);
        return 1;
 }
@@ -75,6 +105,14 @@ static void handle_exit_signal(int signal)
        uloop_end();
 }
 
+static void _request_timeout_handler(struct uloop_timeout *timeout)
+{
+       fprintf(stderr, "Request timed out\n");
+       handle_exit_signal(0);
+}
+
+struct uloop_timeout request_timeout = { .cb = _request_timeout_handler, };
+
 int main(int argc, char **argv)
 {
        static struct qmi_dev dev;
@@ -84,7 +122,7 @@ int main(int argc, char **argv)
        signal(SIGINT, handle_exit_signal);
        signal(SIGTERM, handle_exit_signal);
 
-       while ((ch = getopt_long(argc, argv, "d:k:", uqmi_getopt, NULL)) != -1) {
+       while ((ch = getopt_long(argc, argv, "d:k:smt:", uqmi_getopt, NULL)) != -1) {
                int cmd_opt = CMD_OPT(ch);
 
                if (ch < 0 && cmd_opt >= 0 && cmd_opt < __UQMI_COMMAND_LAST) {
@@ -102,6 +140,15 @@ int main(int argc, char **argv)
                case 'd':
                        device = optarg;
                        break;
+               case 's':
+                       single_line = true;
+                       break;
+               case 'm':
+                       dev.is_mbim = true;
+                       break;
+               case 't':
+                       uloop_timeout_set(&request_timeout, atol(optarg));
+                       break;
                default:
                        return usage(argv[0]);
                }