summaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorGravatar Hector Martin2009-04-28 02:02:55 +0200
committerGravatar Hector Martin2009-04-28 02:02:55 +0200
commitcc9e6a2318352a8fd3a35c25fcb294331ff54288 (patch)
tree75b891a06a7eddf9674327ae387784b0c64967b0 /main.c
parentd982007a7350df35c5aeba820a520779694514a7 (diff)
downloadusbmuxd-cc9e6a2318352a8fd3a35c25fcb294331ff54288.tar.gz
usbmuxd-cc9e6a2318352a8fd3a35c25fcb294331ff54288.tar.bz2
USB mostly complete, main loop added, polls for devices
Diffstat (limited to 'main.c')
-rw-r--r--main.c66
1 files changed, 57 insertions, 9 deletions
diff --git a/main.c b/main.c
index c2467a2..6773d0e 100644
--- a/main.c
+++ b/main.c
@@ -42,13 +42,13 @@ int create_socket(void) {
int listenfd;
if(unlink(socket_path) == -1 && errno != ENOENT) {
- usbmuxd_log(LOG_FATAL, "unlink(%s) failed: %s", socket_path, strerror(errno));
+ usbmuxd_log(LL_FATAL, "unlink(%s) failed: %s", socket_path, strerror(errno));
return -1;
}
listenfd = socket(AF_UNIX, SOCK_STREAM, 0);
if (listenfd == -1) {
- usbmuxd_log(LOG_FATAL, "socket() failed: %s", strerror(errno));
+ usbmuxd_log(LL_FATAL, "socket() failed: %s", strerror(errno));
return -1;
}
@@ -56,37 +56,85 @@ int create_socket(void) {
bind_addr.sun_family = AF_UNIX;
strcpy(bind_addr.sun_path, socket_path);
if (bind(listenfd, (struct sockaddr*)&bind_addr, sizeof(bind_addr)) != 0) {
- usbmuxd_log(LOG_FATAL, "bind() failed: %s", strerror(errno));
+ usbmuxd_log(LL_FATAL, "bind() failed: %s", strerror(errno));
return -1;
}
// Start listening
if (listen(listenfd, 5) != 0) {
- usbmuxd_log(LOG_FATAL, "listen() failed: %s", strerror(errno));
+ usbmuxd_log(LL_FATAL, "listen() failed: %s", strerror(errno));
return -1;
}
return listenfd;
}
+int main_loop(int listenfd)
+{
+ int to, cnt, i;
+ struct fdlist pollfds;
+
+ while(1) {
+ usbmuxd_log(LL_SPEW, "main_loop iteration");
+ to = usb_get_timeout();
+ usbmuxd_log(LL_SPEW, "USB timeout is %d ms", to);
+
+ fdlist_create(&pollfds);
+ usb_get_fds(&pollfds);
+ usbmuxd_log(LL_SPEW, "fd count is %d", pollfds.count);
+
+ cnt = poll(pollfds.fds, pollfds.count, to);
+ usbmuxd_log(LL_SPEW, "poll() returned %d", cnt);
+
+ if(cnt == 0) {
+ if(usb_process() < 0) {
+ usbmuxd_log(LL_FATAL, "usb_process() failed");
+ return -1;
+ }
+ } else {
+ for(i=0; i<pollfds.count; i++) {
+ if(pollfds.fds[i].revents) {
+ if(pollfds.owners[i] == FD_USB) {
+ if(usb_process() < 0) {
+ usbmuxd_log(LL_FATAL, "usb_process() failed");
+ return -1;
+ }
+ }
+ }
+ }
+ }
+ fdlist_free(&pollfds);
+ }
+}
+
int main(int argc, char *argv[])
{
int listenfd;
int res;
- usbmuxd_log(LOG_NOTICE, "usbmux v0.1 starting up");
+ usbmuxd_log(LL_NOTICE, "usbmux v0.1 starting up");
- usbmuxd_log(LOG_INFO, "Creating socket");
+ usbmuxd_log(LL_INFO, "Creating socket");
listenfd = create_socket();
if(listenfd < 0)
return 1;
- usbmuxd_log(LOG_INFO, "Initializing USB");
+ usbmuxd_log(LL_INFO, "Initializing USB");
if((res = usb_init()) < 0)
return 2;
- usbmuxd_log(LOG_INFO, "%d device%s detected", res, (res==1)?"":"s");
+ usbmuxd_log(LL_INFO, "%d device%s detected", res, (res==1)?"":"s");
- usbmuxd_log(LOG_NOTICE, "initialization complete");
+ usbmuxd_log(LL_NOTICE, "Initialization complete");
+
+ res = main_loop(listenfd);
+ if(res < 0)
+ usbmuxd_log(LL_FATAL, "main_loop failed");
+
+ usbmuxd_log(LL_NOTICE, "usbmux shutting down");
+ usb_shutdown();
+ usbmuxd_log(LL_NOTICE, "Shutdown complete");
+ if(res < 0)
+ return -res;
return 0;
}