rpm/dynamips
SHA256
1
0
Fork 0
forked from pool/dynamips
Code Pull Requests Activity

Accepting request 310315 from home:anubisg1:networking

Browse Source 
new upstream version 0.2.15

OBS-URL: https://build.opensuse.org/request/show/310315
OBS-URL: https://build.opensuse.org/package/show/Education/dynamips?expand=0&rev=41
This commit is contained in:
andrea florio 2015-06-04 16:45:30 +00:00 committed by Git OBS Bridge
parent 3ca0b01606
commit dc71685e2d
5 changed files with 11 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dynamips-0.2.14.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3b3f1e68511236d61c14cd635fb39dc4437e8ae5af6de8c6f80c2e1cce1c05b
size 839006

28
dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch
View File

@ -1,28 +0,0 @@
diff -uNr 0ld-dynamips-0.2.14/common/eth_switch.c dynamips-0.2.14/common/eth_switch.c
--- 0ld-dynamips-0.2.14/common/eth_switch.c 2014-11-30 15:11:02.417554374 +0100
+++ dynamips-0.2.14/common/eth_switch.c 2014-11-30 15:11:22.916554628 +0100
@@ -359,9 +359,10 @@
static int ethsw_recv_pkt(netio_desc_t *nio,u_char *pkt,ssize_t pkt_len,
ethsw_table_t *t)
{
- ETHSW_LOCK(t);
- ethsw_receive(t,nio,pkt,pkt_len);
- ETHSW_UNLOCK(t);
+ if (ETHSW_TRYLOCK(t) == 0) {
+ ethsw_receive(t,nio,pkt,pkt_len);
+ ETHSW_UNLOCK(t);
+ }
return(0);
}
diff -uNr 0ld-dynamips-0.2.14/common/eth_switch.h dynamips-0.2.14/common/eth_switch.h
--- 0ld-dynamips-0.2.14/common/eth_switch.h 2014-11-30 15:11:02.417554374 +0100
+++ dynamips-0.2.14/common/eth_switch.h 2014-11-30 15:11:22.916554628 +0100
@@ -74,6 +74,7 @@
#define ETHSW_LOCK(t) pthread_mutex_lock(&(t)->lock)
#define ETHSW_UNLOCK(t) pthread_mutex_unlock(&(t)->lock)
+#define ETHSW_TRYLOCK(t) pthread_mutex_trylock(&(t)->lock)
/* Acquire a reference to an Ethernet switch (increment reference count) */
ethsw_table_t *ethsw_acquire(char *name);

3
dynamips-0.2.15.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f77a88470069dccab391ce786b633061511593efbd0a9b895e5711325eceb36
size 839493

7
dynamips.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Jun 4 16:39:22 UTC 2015 - andrea@opensuse.org
- New upstream version 0.2.15
* minor fixes for OSX
- removed dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Nov 30 13:35:30 UTC 2014 - andrea@opensuse.org Sun Nov 30 13:35:30 UTC 2014 - andrea@opensuse.org

4
dynamips.spec
View File

@ -17,7 +17,7 @@
Name: dynamips Name: dynamips
Version: 0.2.14 Version: 0.2.15
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake BuildRequires: cmake
@ -33,7 +33,6 @@ BuildRequires: glibc-devel-32bit
%endif %endif
%endif %endif
Source: %{name}-%{version}.tar.gz Source: %{name}-%{version}.tar.gz
Patch0: dynamips-0.2.14_fix_hanging_ethsw_add_nio.patch
Summary: Cisco router Emulator Summary: Cisco router Emulator
License: GPL-2.0+ License: GPL-2.0+
Group: System/Emulators/Other Group: System/Emulators/Other
@ -49,7 +48,6 @@ or people wanting to pass their CCNA/CCNP/CCIE exams.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
mkdir build mkdir build