1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
--- dynamips.c.orig Wed Feb 14 20:37:58 2007
+++ dynamips.c Fri Apr 6 21:11:38 2007
@@ -61,6 +61,7 @@
/* Hypervisor */
int hypervisor_mode = 0;
int hypervisor_tcp_port = 0;
+char hypervisor_ip_address[263]="\000"; /* 256(MAXHOSTNAMELEN)+1(:)+5(port)+NULL */
/* Log file */
char *log_file_name = NULL;
@@ -227,7 +228,7 @@
printf("Usage: %s [options] <ios_image>\n\n",argv[0]);
printf("Available options:\n"
- " -H <tcp_port> : Run in hypervisor mode\n\n"
+ " -H [ip_address:]<tcp_port> : Run in hypervisor mode\n\n"
" -P <platform> : Platform to emulate (7200, 3600, "
"2691, 3725 or 3745) "
"(default: 7200)\n\n"
@@ -254,7 +255,7 @@
" -R <rom_file> : Load an alternate ROM (default: embedded)\n"
" -k <clock_div> : Set the clock divisor (default: %d)\n"
"\n"
- " -T <port> : Console is on TCP <port>\n"
+ " -T [ip_address:]<port> : Console is on TCP <port>\n"
" -U <si_desc> : Console in on serial interface <si_desc>\n"
" (default is on the terminal)\n"
"\n"
@@ -780,6 +781,7 @@
int instance_id;
int res,option;
char *str;
+ char *index;
/* Get the instance ID */
instance_id = 0;
@@ -944,7 +946,15 @@
/* TCP server for Console Port */
case 'T':
vm->vtty_con_type = VTTY_TYPE_TCP;
- vm->vtty_con_tcp_port = atoi(optarg);
+ strncpy(hypervisor_ip_address,optarg,sizeof(hypervisor_ip_address));
+ index=strrchr(hypervisor_ip_address,':');
+ if (index != NULL) {
+ *index++='\000';
+ vm->vtty_con_tcp_port = atoi(index);
+ } else {
+ vm->vtty_con_tcp_port = atoi(hypervisor_ip_address);
+ hypervisor_ip_address[0]='\000';
+ }
break;
/* Serial interface for Console port */
@@ -1061,6 +1071,7 @@
static int run_hypervisor(int argc,char *argv[])
{
char *options_list = "H:l:hN:";
+ char *index;
int i,option;
for(i=1;i<argc;i++)
@@ -1079,7 +1090,15 @@
{
/* Hypervisor TCP port */
case 'H':
- hypervisor_tcp_port = atoi(optarg);
+ strncpy(hypervisor_ip_address,optarg,sizeof(hypervisor_ip_address));
+ index=strrchr(hypervisor_ip_address,':');
+ if (index != NULL) {
+ *index++='\000';
+ hypervisor_tcp_port = atoi(index);
+ } else {
+ hypervisor_tcp_port = atoi(hypervisor_ip_address);
+ hypervisor_ip_address[0]='\000';
+ }
break;
/* Log file */
@@ -1244,7 +1263,7 @@
/* Free resources used by instance */
vm_release(vm);
} else {
- hypervisor_tcp_server(hypervisor_tcp_port);
+ hypervisor_tcp_server(hypervisor_ip_address,hypervisor_tcp_port);
}
dynamips_reset();
|
