Changes in / [8f6bffdd:c4b0317] in mainline
- Files:
-
- 32 added
- 32 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/Makefile.common
r8f6bffdd rc4b0317 72 72 $(USPACE_PATH)/srv/loader/loader \ 73 73 $(USPACE_PATH)/app/init/init \ 74 $(USPACE_PATH)/srv/loc /loc\74 $(USPACE_PATH)/srv/locsrv/locsrv \ 75 75 $(USPACE_PATH)/srv/bd/rd/rd \ 76 76 $(USPACE_PATH)/srv/vfs/vfs … … 107 107 $(USPACE_PATH)/srv/hid/remcons/remcons \ 108 108 $(USPACE_PATH)/srv/net/ethip/ethip \ 109 $(USPACE_PATH)/srv/net/inet /inet\109 $(USPACE_PATH)/srv/net/inetsrv/inetsrv \ 110 110 $(USPACE_PATH)/srv/net/loopip/loopip \ 111 111 $(USPACE_PATH)/srv/net/tcp/tcp \ … … 157 157 $(USPACE_PATH)/app/edit/edit \ 158 158 $(USPACE_PATH)/app/ext2info/ext2info \ 159 $(USPACE_PATH)/app/inet cfg/inetcfg\159 $(USPACE_PATH)/app/inet/inet \ 160 160 $(USPACE_PATH)/app/kill/kill \ 161 161 $(USPACE_PATH)/app/killall/killall \ 162 $(USPACE_PATH)/app/loc info/locinfo\162 $(USPACE_PATH)/app/loc/loc \ 163 163 $(USPACE_PATH)/app/mkfat/mkfat \ 164 164 $(USPACE_PATH)/app/mkexfat/mkexfat \ -
uspace/Makefile
r8f6bffdd rc4b0317 42 42 app/getterm \ 43 43 app/init \ 44 app/inet cfg\44 app/inet \ 45 45 app/kill \ 46 46 app/killall \ 47 47 app/klog \ 48 app/loc info\48 app/loc \ 49 49 app/lsusb \ 50 50 app/mkfat \ … … 69 69 app/nettest3 \ 70 70 app/ping \ 71 app/websrv \72 71 app/sysinfo \ 73 72 app/mkbd \ 73 app/websrv \ 74 74 srv/clipboard \ 75 srv/loc \75 srv/locsrv \ 76 76 srv/devman \ 77 77 srv/loader \ 78 78 srv/net/ethip \ 79 srv/net/inet \79 srv/net/inetsrv \ 80 80 srv/net/loopip \ 81 81 srv/net/tcp \ -
uspace/app/init/init.c
r8f6bffdd rc4b0317 307 307 spawn("/srv/loopip"); 308 308 spawn("/srv/ethip"); 309 spawn("/srv/inet ");309 spawn("/srv/inetsrv"); 310 310 spawn("/srv/tcp"); 311 311 spawn("/srv/udp"); -
uspace/app/sbi/src/stype.c
r8f6bffdd rc4b0317 652 652 assert(iface_ti->tic == tic_tobject); 653 653 iface = iface_ti->u.tobject->csi; 654 assert(iface->cc = csi_interface);654 assert(iface->cc == csi_interface); 655 655 656 656 #ifdef DEBUG_TYPE_TRACE -
uspace/app/websrv/websrv.c
r8f6bffdd rc4b0317 1 1 /* 2 * Copyright (c) 201 1Jiri Svoboda2 * Copyright (c) 2012 Jiri Svoboda 3 3 * All rights reserved. 4 4 * … … 41 41 #include <stdlib.h> 42 42 #include <fcntl.h> 43 #include <task.h> 43 44 44 45 #include <net/in.h> … … 71 72 72 73 static char fbuf[BUFFER_SIZE]; 74 75 static bool verbose = false; 73 76 74 77 /** Responses to send to client. */ … … 187 190 size_t response_size = str_size(msg); 188 191 189 fprintf(stderr, "Sending response\n"); 192 if (verbose) 193 fprintf(stderr, "Sending response\n"); 194 190 195 ssize_t rc = send(conn_sd, (void *) msg, response_size, 0); 191 196 if (rc < 0) { … … 251 256 } 252 257 253 fprintf(stderr, "Request: %s", lbuf); 258 if (verbose) 259 fprintf(stderr, "Request: %s", lbuf); 254 260 255 261 if (str_lcmp(lbuf, "GET ", 4) != 0) { … … 266 272 267 273 *end_uri = '\0'; 268 fprintf(stderr, "Requested URI: %s\n", uri); 274 if (verbose) 275 fprintf(stderr, "Requested URI: %s\n", uri); 269 276 270 277 if (!uri_is_valid(uri)) { … … 287 294 "\n" 288 295 "-h | --help\n" 289 "\tShow this application help.\n"); 296 "\tShow this application help.\n" 297 "-v | --verbose\n" 298 "\tVerbose mode\n"); 290 299 } 291 300 … … 306 315 307 316 port = (uint16_t) value; 317 break; 318 case 'v': 319 verbose = true; 308 320 break; 309 321 /* Long options with double dash */ … … 318 330 319 331 port = (uint16_t) value; 332 } else if (str_cmp(argv[*index] +2, "verbose") == 0) { 333 verbose = true; 320 334 } else { 321 335 usage(); … … 358 372 } 359 373 360 fprintf(stderr, "Creating socket\n"); 374 printf("%s: HelenOS web server\n", NAME); 375 376 if (verbose) 377 fprintf(stderr, "Creating socket\n"); 361 378 362 379 int listen_sd = socket(PF_INET, SOCK_STREAM, 0); … … 380 397 } 381 398 382 fprintf(stderr, "Listening for connections at port %" PRIu16 "\n", 383 port); 399 fprintf(stderr, "%s: Listening for connections at port %" PRIu16 "\n", 400 NAME, port); 401 402 task_retval(0); 403 384 404 while (true) { 385 405 struct sockaddr_in raddr; … … 393 413 } 394 414 395 fprintf(stderr, "Connection accepted (sd=%d), " 396 "waiting for request\n", conn_sd); 415 if (verbose) { 416 fprintf(stderr, "Connection accepted (sd=%d), " 417 "waiting for request\n", conn_sd); 418 } 397 419 398 420 rbuf_out = 0; … … 412 434 } 413 435 414 fprintf(stderr, "Connection closed\n"); 436 if (verbose) 437 fprintf(stderr, "Connection closed\n"); 415 438 } 416 439 -
uspace/lib/usb/src/hc.c
r8f6bffdd rc4b0317 66 66 if (connection->ref_count == 0) { 67 67 /* Closing already closed connection... */ 68 assert(connection->hc_sess = NULL);68 assert(connection->hc_sess == NULL); 69 69 fibril_mutex_unlock(&connection->guard); 70 70 return EOK;
Note:
See TracChangeset
for help on using the changeset viewer.