summaryrefslogtreecommitdiff
path: root/emulators/dynamips/files
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/dynamips/files')
-rw-r--r--emulators/dynamips/files/patch-Makefile35
-rw-r--r--emulators/dynamips/files/patch-README11
-rw-r--r--emulators/dynamips/files/patch-README.hypervisor11
-rw-r--r--emulators/dynamips/files/patch-dev_vtty.c33
-rw-r--r--emulators/dynamips/files/patch-dynamips.120
-rw-r--r--emulators/dynamips/files/patch-dynamips.c87
-rw-r--r--emulators/dynamips/files/patch-gen_eth.c26
-rw-r--r--emulators/dynamips/files/patch-hypervisor.c20
-rw-r--r--emulators/dynamips/files/patch-hypervisor.h10
-rw-r--r--emulators/dynamips/files/patch-hypervisor_mode.711
-rw-r--r--emulators/dynamips/files/patch-net.c46
-rw-r--r--emulators/dynamips/files/patch-net.h10
-rw-r--r--emulators/dynamips/files/patch-nvram_export.111
-rw-r--r--emulators/dynamips/files/patch-utils.c11
-rw-r--r--emulators/dynamips/files/patch-utils.h20
15 files changed, 0 insertions, 362 deletions
diff --git a/emulators/dynamips/files/patch-Makefile b/emulators/dynamips/files/patch-Makefile
deleted file mode 100644
index f5ef297cafed..000000000000
--- a/emulators/dynamips/files/patch-Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.orig Thu Feb 8 15:23:36 2007
-+++ Makefile Thu Feb 8 15:34:39 2007
-@@ -12,6 +12,9 @@
- # (WinPcap is used for Cygwin)
- HAS_PCAP?=1
-
-+# Change this to 1 if your system has posix_memalign
-+HAS_POSIX_MEMALIGN?=0
-+
- # Current dynamips release
- VERSION_TRAIN=0.2.7
- VERSION_SUB=
-@@ -34,16 +37,17 @@
- -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \
- -DARCH_INC_FILE=$(ARCH_INC_FILE) -DDYNAMIPS_VERSION=\"$(VERSION)\" \
- -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
-- -DHAS_RFC2553=$(HAS_RFC2553)
-+ -DHAS_RFC2553=$(HAS_RFC2553) -DHAS_POSIX_MEMALIGN=$(HAS_POSIX_MEMALIGN)
-
--PCAP_LIB=/usr/local/lib/libpcap.a
--#PCAP_LIB=-lpcap
-+#PCAP_LIB=/usr/local/lib/libpcap.a
-+PCAP_LIB=-lpcap
-
- ifeq ($(shell uname), FreeBSD)
- PTHREAD_LIBS?=-pthread
-- CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS) \
-+ LOCALBASE?=/usr/local
-+ CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/libelf $(PTHREAD_CFLAGS) \
- -D_FILE_OFFSET_BITS=64
-- LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS)
-+ LIBS=-L$(LOCALBASE)/lib -L. -lelf $(PTHREAD_LIBS) $(LDFLAGS)
- else
- ifeq ($(shell uname), Linux)
- PTHREAD_LIBS?=-lpthread
diff --git a/emulators/dynamips/files/patch-README b/emulators/dynamips/files/patch-README
deleted file mode 100644
index 4b092b6bc69b..000000000000
--- a/emulators/dynamips/files/patch-README
+++ /dev/null
@@ -1,11 +0,0 @@
---- README.orig Fri Apr 6 20:53:59 2007
-+++ README Fri Apr 6 20:57:02 2007
-@@ -50,7 +50,7 @@
- -R <rom_file> : Load an alternate ROM (default: embedded)
- -k <clock_div> : Set the clock divisor (default: 4)
-
-- -T <port> : Console is on TCP <port>
-+ -T [ip_address:]<port> : Console is on TCP <port>
- -U <si_desc> : Console in on serial interface <si_desc>
- (default is on the terminal)
-
diff --git a/emulators/dynamips/files/patch-README.hypervisor b/emulators/dynamips/files/patch-README.hypervisor
deleted file mode 100644
index 6575388ea27d..000000000000
--- a/emulators/dynamips/files/patch-README.hypervisor
+++ /dev/null
@@ -1,11 +0,0 @@
---- README.hypervisor.orig Wed Mar 21 10:00:28 2007
-+++ README.hypervisor Wed Mar 21 10:01:22 2007
-@@ -8,7 +8,7 @@
- Running dynamips in hypervisor mode
- ===================================
-
--dynamips -H <tcp_port>
-+dynamips -H [ip_address:]<tcp_port>
-
- Managing the hypervisor
- =======================
diff --git a/emulators/dynamips/files/patch-dev_vtty.c b/emulators/dynamips/files/patch-dev_vtty.c
deleted file mode 100644
index e99df79b2592..000000000000
--- a/emulators/dynamips/files/patch-dev_vtty.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- dev_vtty.c.orig Fri Apr 6 16:44:07 2007
-+++ dev_vtty.c Fri Apr 6 19:43:37 2007
-@@ -24,6 +24,8 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <assert.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
-
- #include <arpa/telnet.h>
-
-@@ -43,6 +45,8 @@
- #include "dev_c2600.h"
- #include "dev_vtty.h"
-
-+extern char hypervisor_ip_address[];
-+
- /* VTTY list */
- static pthread_mutex_t vtty_list_mutex = PTHREAD_MUTEX_INITIALIZER;
- static vtty_t *vtty_list = NULL;
-@@ -132,7 +136,11 @@
-
- memset(&serv,0,sizeof(serv));
- serv.sin_family = AF_INET;
-- serv.sin_addr.s_addr = htonl(INADDR_ANY);
-+ if (strlen(hypervisor_ip_address) != 0 &&
-+ inet_addr(hypervisor_ip_address) != INADDR_NONE)
-+ serv.sin_addr.s_addr = inet_addr(hypervisor_ip_address);
-+ else
-+ serv.sin_addr.s_addr = htonl(INADDR_ANY);
- serv.sin_port = htons(vtty->tcp_port);
-
- if (bind(vtty->accept_fd,(struct sockaddr *)&serv,sizeof(serv)) < 0) {
diff --git a/emulators/dynamips/files/patch-dynamips.1 b/emulators/dynamips/files/patch-dynamips.1
deleted file mode 100644
index cfa724c388d8..000000000000
--- a/emulators/dynamips/files/patch-dynamips.1
+++ /dev/null
@@ -1,20 +0,0 @@
---- dynamips.1.orig Wed Feb 14 20:37:58 2007
-+++ dynamips.1 Fri Apr 6 20:59:41 2007
-@@ -44,7 +44,7 @@
- .SH OPTIONS
- A summary of options is included below.
- .TP
--.B -H <tcp_port>
-+.B -H [ip_address:]<tcp_port>
- Enable hypervisor mode.
- .br
- The hypervisor mode of dynamips allows you to run simultaneously
-@@ -133,7 +133,7 @@
- The command "show clock" at the IOS' CLI will help you set this value.
-
- .TP
--.B -T <port>
-+.B -T [ip_address:]<port>
- Console is on TCP <port>
- .TP
- .B -U <si_desc>
diff --git a/emulators/dynamips/files/patch-dynamips.c b/emulators/dynamips/files/patch-dynamips.c
deleted file mode 100644
index a2631b8f28be..000000000000
--- a/emulators/dynamips/files/patch-dynamips.c
+++ /dev/null
@@ -1,87 +0,0 @@
---- 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();
diff --git a/emulators/dynamips/files/patch-gen_eth.c b/emulators/dynamips/files/patch-gen_eth.c
deleted file mode 100644
index 97f60cdd3222..000000000000
--- a/emulators/dynamips/files/patch-gen_eth.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gen_eth.c.orig 2007-05-26 18:52:33.000000000 +0900
-+++ gen_eth.c 2009-07-21 03:18:35.194759073 +0900
-@@ -22,6 +22,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/wait.h>
-+#include <sys/ioctl.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <pthread.h>
-@@ -45,8 +46,13 @@
- if (!(p = pcap_open_live(device,2048,TRUE,10,pcap_errbuf)))
- goto pcap_error;
-
-- /* Accept only incoming packets */
-- pcap_setdirection(p,PCAP_D_IN);
-+ pcap_setdirection(p,PCAP_D_INOUT);
-+#ifdef BIOCFEEDBACK
-+ {
-+ int on = 1;
-+ ioctl(pcap_fileno(p), BIOCFEEDBACK, &on);
-+ }
-+#endif
- #else
- p = pcap_open(device,2048,
- PCAP_OPENFLAG_PROMISCUOUS |
diff --git a/emulators/dynamips/files/patch-hypervisor.c b/emulators/dynamips/files/patch-hypervisor.c
deleted file mode 100644
index d3e5cbf09360..000000000000
--- a/emulators/dynamips/files/patch-hypervisor.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- hypervisor.c.orig Wed Mar 21 11:11:12 2007
-+++ hypervisor.c Wed Mar 21 11:29:55 2007
-@@ -535,7 +535,7 @@
- }
-
- /* Hypervisor TCP server */
--int hypervisor_tcp_server(int tcp_port)
-+int hypervisor_tcp_server(char* ip_address,int tcp_port)
- {
- int fd_array[HYPERVISOR_MAX_FD];
- struct sockaddr_storage remote_addr;
-@@ -565,7 +565,7 @@
- if (!tcp_port)
- tcp_port = HYPERVISOR_TCP_PORT;
-
-- fd_count = ip_listen(tcp_port,SOCK_STREAM,HYPERVISOR_MAX_FD,fd_array);
-+ fd_count = ip_listen(ip_address,tcp_port,SOCK_STREAM,HYPERVISOR_MAX_FD,fd_array);
-
- if (fd_count <= 0) {
- fprintf(stderr,"Hypervisor: unable to create TCP sockets.\n");
diff --git a/emulators/dynamips/files/patch-hypervisor.h b/emulators/dynamips/files/patch-hypervisor.h
deleted file mode 100644
index 2b7458bd5aaf..000000000000
--- a/emulators/dynamips/files/patch-hypervisor.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- hypervisor.h.orig Wed Mar 21 10:58:06 2007
-+++ hypervisor.h Wed Mar 21 11:09:40 2007
-@@ -136,6 +136,6 @@
- int hypervisor_stopsig(void);
-
- /* Hypervisor TCP server */
--int hypervisor_tcp_server(int tcp_port);
-+int hypervisor_tcp_server(char *ip_address,int tcp_port);
-
- #endif
diff --git a/emulators/dynamips/files/patch-hypervisor_mode.7 b/emulators/dynamips/files/patch-hypervisor_mode.7
deleted file mode 100644
index d11ced491f95..000000000000
--- a/emulators/dynamips/files/patch-hypervisor_mode.7
+++ /dev/null
@@ -1,11 +0,0 @@
---- hypervisor_mode.7.orig Wed Mar 21 11:02:14 2007
-+++ hypervisor_mode.7 Wed Mar 21 11:02:40 2007
-@@ -5,7 +5,7 @@
- or Frame-Relay networks.
- .SH SYNOPSIS
- .B dynamips -H
--\fItcp_port\fP
-+\fI[ip_address:]tcp_port\fP
-
- .SH DESCRIPTION
- You can connect directly to the TCP control port with telnet, or use
diff --git a/emulators/dynamips/files/patch-net.c b/emulators/dynamips/files/patch-net.c
deleted file mode 100644
index 88746365ed8f..000000000000
--- a/emulators/dynamips/files/patch-net.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- net.c.orig 2007-05-26 18:52:33.000000000 +0900
-+++ net.c 2009-07-21 03:16:45.891581213 +0900
-@@ -208,6 +208,7 @@
- addr->eth_addr_byte[3] = v[1] & 0xFF;
- addr->eth_addr_byte[4] = (v[2] >> 8) & 0xFF;
- addr->eth_addr_byte[5] = v[2] & 0xFF;
-+ return(0);
- }
-
- return(-1);
-@@ -353,7 +354,7 @@
-
- #if HAS_RFC2553
- /* Listen on the specified port */
--int ip_listen(int port,int sock_type,int max_fd,int fd_array[])
-+int ip_listen(char *ip_address,int port,int sock_type,int max_fd,int fd_array[])
- {
- struct addrinfo hints,*res,*res0;
- char port_str[20];
-@@ -370,7 +371,7 @@
-
- snprintf(port_str,sizeof(port_str),"%d",port);
-
-- if ((error = getaddrinfo(NULL,port_str,&hints,&res0)) != 0) {
-+ if ((error = getaddrinfo((strlen(ip_address)==0)?NULL:ip_address,port_str,&hints,&res0)) != 0) {
- fprintf(stderr,"ip_listen: %s", gai_strerror(error));
- return(-1);
- }
-@@ -405,7 +406,7 @@
- }
- #else
- /* Listen on the specified port */
--int ip_listen(int port,int sock_type,int max_fd,int fd_array[])
-+int ip_listen(char *ip_address,int port,int sock_type,int max_fd,int fd_array[])
- {
- struct sockaddr_in sin;
- int i,sck,reuse=1;
-@@ -422,6 +423,8 @@
- memset(&sin,0,sizeof(sin));
- sin.sin_family = PF_INET;
- sin.sin_port = htons(port);
-+ if (strlen(ip_address) != 0 && inet_addr(ip_address) != INADDR_NONE)
-+ sin.sin_addr = inet_addr(ip_address);
-
- setsockopt(fd_array[0],SOL_SOCKET,SO_REUSEADDR,&reuse,sizeof(reuse));
-
diff --git a/emulators/dynamips/files/patch-net.h b/emulators/dynamips/files/patch-net.h
deleted file mode 100644
index c464eda2bac6..000000000000
--- a/emulators/dynamips/files/patch-net.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- net.h.orig Wed Mar 21 11:32:05 2007
-+++ net.h Wed Mar 21 11:33:28 2007
-@@ -218,6 +218,6 @@
- int udp_connect(int local_port,char *remote_host,int remote_port);
-
- /* Listen on the specified port */
--int ip_listen(int port,int sock_type,int max_fd,int fd_array[]);
-+int ip_listen(char *ip_address,int port,int sock_type,int max_fd,int fd_array[]);
-
- #endif
diff --git a/emulators/dynamips/files/patch-nvram_export.1 b/emulators/dynamips/files/patch-nvram_export.1
deleted file mode 100644
index 477b8b7e65d1..000000000000
--- a/emulators/dynamips/files/patch-nvram_export.1
+++ /dev/null
@@ -1,11 +0,0 @@
---- nvram_export.1.orig Thu May 3 12:46:51 2007
-+++ nvram_export.1 Thu May 3 12:47:10 2007
-@@ -13,7 +13,7 @@
- Please send bug reports to http://www.ipflow.utc.fr/bts/
- .SH SEE ALSO
- .br
--\fBdynmips\fP(1), \fBhypervisor_mode\fP(7)
-+\fBdynamips\fP(1), \fBhypervisor_mode\fP(7)
- .br
- .UR
- http://www.ipflow.utc.fr/index.php/
diff --git a/emulators/dynamips/files/patch-utils.c b/emulators/dynamips/files/patch-utils.c
deleted file mode 100644
index 970f89eb2e78..000000000000
--- a/emulators/dynamips/files/patch-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils.c.orig Wed Mar 8 22:53:21 2006
-+++ utils.c Wed Mar 8 22:53:37 2006
-@@ -187,7 +187,7 @@
- {
- void *p;
-
--#ifdef __linux__
-+#if defined(__linux__) || HAS_POSIX_MEMALIGN
- if (posix_memalign((void *)&p,boundary,size))
- #else
- #ifdef __CYGWIN__
diff --git a/emulators/dynamips/files/patch-utils.h b/emulators/dynamips/files/patch-utils.h
deleted file mode 100644
index f3219655f78b..000000000000
--- a/emulators/dynamips/files/patch-utils.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- utils.h.orig Wed Feb 14 20:37:58 2007
-+++ utils.h Tue Feb 20 18:56:54 2007
-@@ -12,6 +12,8 @@
- #include <sys/time.h>
- #include <time.h>
- #include <netinet/in.h>
-+#include <pthread.h>
-+#include <signal.h>
-
- /* True/False definitions */
- #ifndef FALSE
-@@ -35,6 +37,8 @@
- #elif defined(__i386) || defined(__i386__) || defined(i386)
- #define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN
- #elif defined(__x86_64__)
-+#define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN
-+#elif defined(__ia64__)
- #define ARCH_BYTE_ORDER ARCH_LITTLE_ENDIAN
- #endif
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-30 17:04:14 +0000