Page MenuHomeFreeBSD
Differential D4680

Update devel/py-wcwidth to 0.1.5
ClosedPublic
Actions

Authored by sunpoet on Dec 22 2015, 2:31 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 6, 11:32 PM
Unknown Object (File)
Thu, Apr 3, 12:18 PM
Unknown Object (File)
Thu, Apr 3, 10:51 AM
Unknown Object (File)
Thu, Apr 3, 9:01 AM
Unknown Object (File)
Thu, Apr 3, 6:39 AM
Unknown Object (File)
Mon, Mar 24, 1:59 AM
Unknown Object (File)
Nov 25 2024, 2:37 AM
Unknown Object (File)
Nov 24 2024, 4:31 AM
View All 49 Files
Subscribers
None

Details

Reviewers
skreuzer
Summary
  • Update to 0.1.5
  • Add NO_ARCH
  • Relax USES=python
  • Allow concurrent installation (USE_PYTHON=concurrent)

Changes: https://github.com/jquast/wcwidth/releases

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 1786
Build 1792: arc lint + arc unit

Event Timeline

sunpoet updated this revision to Diff 11580.Dec 22 2015, 2:31 PM
sunpoet retitled this revision from to Update devel/py-wcwidth to 0.1.5.
sunpoet updated this object.
sunpoet edited the test plan for this revision. (Show Details)
sunpoet added a reviewer: skreuzer.
skreuzer accepted this revision.Dec 22 2015, 2:54 PM
skreuzer edited edge metadata.

Looks good. Please commit it. Thanks

This revision is now accepted and ready to land.Dec 22 2015, 2:54 PM
sunpoet closed this revision.Dec 22 2015, 3:39 PM

Revision Contents
Changeset List

PathSize
devel/
py-wcwidth/
7 lines
4 lines

Diff 11580

View Options

devel/py-wcwidth/Makefile

Show First 20 Lines • Show All 426 Lines • ▼ Show 20 Lines
SYSCTL_NODE(_net_link, OID_AUTO, vxlan, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, SYSCTL_NODE(_net_link, OID_AUTO, vxlan, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"Virtual eXtensible Local Area Network"); "Virtual eXtensible Local Area Network");
static int vxlan_legacy_port = 0; static int vxlan_legacy_port = 0;
TUNABLE_INT("net.link.vxlan.legacy_port", &vxlan_legacy_port); TUNABLE_INT("net.link.vxlan.legacy_port", &vxlan_legacy_port);
static int vxlan_reuse_port = 0; static int vxlan_reuse_port = 0;
TUNABLE_INT("net.link.vxlan.reuse_port", &vxlan_reuse_port); TUNABLE_INT("net.link.vxlan.reuse_port", &vxlan_reuse_port);
/*
* This macro controls the default upper limitation on nesting of vxlan
* tunnels. By default it is 3, as the overhead of IPv6 vxlan tunnel is 70
* bytes, this will create at most 210 bytes overhead and the most inner
* tunnel's MTU will be 1290 which will meet IPv6 minimum MTU size 1280.
* Be careful to configure the tunnels when raising the limit. A large
kpUnsubmitted
Not Done
Inline Actions

It's not quite that risky, because if_tunnel_check_nesting() checks if the last tunnel hop was this struct ifnet, so if users configure a loop the packet will be discarded immediately, not when it hits the nesting limit.

We do still need the limit, because users might configure a large number of different nested tunnels, which could still run us out of stack space, but that's harder to do by accident.

kp: It's not quite that risky, because if_tunnel_check_nesting() checks if the last tunnel hop was…
zleiAuthorUnsubmitted
Done
Inline Actions

It's not quite that risky, because if_tunnel_check_nesting() checks if the last tunnel hop was this struct ifnet, so if users configure a loop the packet will be discarded immediately, not when it hits the nesting limit.

I rechecked implementation of if_tunnel_check_nesting() and you are right :) Thanks for catching that.

We do still need the limit, because users might configure a large number of different nested tunnels, which could still run us out of stack space, but that's harder to do by accident.

True indeed.

zlei: > It's not quite that risky, because if_tunnel_check_nesting() checks if the last tunnel hop…
* number of nested tunnels can introduce system crash.
*/
#ifndef MAX_VXLAN_NEST
#define MAX_VXLAN_NEST 3
#endif
static int max_vxlan_nesting = MAX_VXLAN_NEST;
SYSCTL_INT(_net_link_vxlan, OID_AUTO, max_nesting, CTLFLAG_RW,
&max_vxlan_nesting, 0, "Max nested tunnels");
/* Default maximum number of addresses in the forwarding table. */ /* Default maximum number of addresses in the forwarding table. */
#ifndef VXLAN_FTABLE_MAX #ifndef VXLAN_FTABLE_MAX
#define VXLAN_FTABLE_MAX 2000 #define VXLAN_FTABLE_MAX 2000
#endif #endif
/* Timeout (in seconds) of addresses learned in the forwarding table. */ /* Timeout (in seconds) of addresses learned in the forwarding table. */
#ifndef VXLAN_FTABLE_TIMEOUT #ifndef VXLAN_FTABLE_TIMEOUT
#define VXLAN_FTABLE_TIMEOUT (20 * 60) #define VXLAN_FTABLE_TIMEOUT (20 * 60)
▲ Show 20 Lines • Show All 2,273 Lines • ▼ Show 20 Lines#ifdef INET6
return (error); return (error);
#else #else
m_freem(m); m_freem(m);
return (ENOTSUP); return (ENOTSUP);
#endif #endif
} }
#define MTAG_VXLAN_LOOP 0x7876706c /* vxlp */
static int static int
vxlan_transmit(struct ifnet *ifp, struct mbuf *m) vxlan_transmit(struct ifnet *ifp, struct mbuf *m)
{ {
struct rm_priotracker tracker; struct rm_priotracker tracker;
union vxlan_sockaddr vxlsa; union vxlan_sockaddr vxlsa;
struct vxlan_softc *sc; struct vxlan_softc *sc;
struct vxlan_ftable_entry *fe; struct vxlan_ftable_entry *fe;
struct ifnet *mcifp; struct ifnet *mcifp;
struct ether_header *eh; struct ether_header *eh;
int ipv4, error; int ipv4, error;
sc = ifp->if_softc; sc = ifp->if_softc;
eh = mtod(m, struct ether_header *); eh = mtod(m, struct ether_header *);
fe = NULL; fe = NULL;
mcifp = NULL; mcifp = NULL;
ETHER_BPF_MTAP(ifp, m); ETHER_BPF_MTAP(ifp, m);
VXLAN_RLOCK(sc, &tracker); VXLAN_RLOCK(sc, &tracker);
M_SETFIB(m, sc->vxl_fibnum); M_SETFIB(m, sc->vxl_fibnum);
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
VXLAN_RUNLOCK(sc, &tracker); VXLAN_RUNLOCK(sc, &tracker);
m_freem(m); m_freem(m);
return (ENETDOWN); return (ENETDOWN);
}
if (__predict_false(if_tunnel_check_nesting(ifp, m, MTAG_VXLAN_LOOP,
max_vxlan_nesting) != 0)) {
VXLAN_RUNLOCK(sc, &tracker);
m_freem(m);
if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
return (ELOOP);
} }
if ((m->m_flags & (M_BCAST | M_MCAST)) == 0) if ((m->m_flags & (M_BCAST | M_MCAST)) == 0)
fe = vxlan_ftable_entry_lookup(sc, eh->ether_dhost); fe = vxlan_ftable_entry_lookup(sc, eh->ether_dhost);
if (fe == NULL) if (fe == NULL)
fe = &sc->vxl_default_fe; fe = &sc->vxl_default_fe;
vxlan_sockaddr_copy(&vxlsa, &fe->vxlfe_raddr.sa); vxlan_sockaddr_copy(&vxlsa, &fe->vxlfe_raddr.sa);
▲ Show 20 Lines • Show All 944 Lines • Show Last 20 Lines
View Options

devel/py-wcwidth/distinfo

Show First 20 Lines • Show All 426 Lines • ▼ Show 20 Lines
SYSCTL_NODE(_net_link, OID_AUTO, vxlan, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, SYSCTL_NODE(_net_link, OID_AUTO, vxlan, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
"Virtual eXtensible Local Area Network"); "Virtual eXtensible Local Area Network");
static int vxlan_legacy_port = 0; static int vxlan_legacy_port = 0;
TUNABLE_INT("net.link.vxlan.legacy_port", &vxlan_legacy_port); TUNABLE_INT("net.link.vxlan.legacy_port", &vxlan_legacy_port);
static int vxlan_reuse_port = 0; static int vxlan_reuse_port = 0;
TUNABLE_INT("net.link.vxlan.reuse_port", &vxlan_reuse_port); TUNABLE_INT("net.link.vxlan.reuse_port", &vxlan_reuse_port);
/*
* This macro controls the default upper limitation on nesting of vxlan
* tunnels. By default it is 3, as the overhead of IPv6 vxlan tunnel is 70
* bytes, this will create at most 210 bytes overhead and the most inner
* tunnel's MTU will be 1290 which will meet IPv6 minimum MTU size 1280.
* Be careful to configure the tunnels when raising the limit. A large
kpUnsubmitted
Not Done
Inline Actions

It's not quite that risky, because if_tunnel_check_nesting() checks if the last tunnel hop was this struct ifnet, so if users configure a loop the packet will be discarded immediately, not when it hits the nesting limit.

We do still need the limit, because users might configure a large number of different nested tunnels, which could still run us out of stack space, but that's harder to do by accident.

kp: It's not quite that risky, because if_tunnel_check_nesting() checks if the last tunnel hop was…
zleiAuthorUnsubmitted
Done
Inline Actions

It's not quite that risky, because if_tunnel_check_nesting() checks if the last tunnel hop was this struct ifnet, so if users configure a loop the packet will be discarded immediately, not when it hits the nesting limit.

I rechecked implementation of if_tunnel_check_nesting() and you are right :) Thanks for catching that.

We do still need the limit, because users might configure a large number of different nested tunnels, which could still run us out of stack space, but that's harder to do by accident.

True indeed.

zlei: > It's not quite that risky, because if_tunnel_check_nesting() checks if the last tunnel hop…
* number of nested tunnels can introduce system crash.
*/
#ifndef MAX_VXLAN_NEST
#define MAX_VXLAN_NEST 3
#endif
static int max_vxlan_nesting = MAX_VXLAN_NEST;
SYSCTL_INT(_net_link_vxlan, OID_AUTO, max_nesting, CTLFLAG_RW,
&max_vxlan_nesting, 0, "Max nested tunnels");
/* Default maximum number of addresses in the forwarding table. */ /* Default maximum number of addresses in the forwarding table. */
#ifndef VXLAN_FTABLE_MAX #ifndef VXLAN_FTABLE_MAX
#define VXLAN_FTABLE_MAX 2000 #define VXLAN_FTABLE_MAX 2000
#endif #endif
/* Timeout (in seconds) of addresses learned in the forwarding table. */ /* Timeout (in seconds) of addresses learned in the forwarding table. */
#ifndef VXLAN_FTABLE_TIMEOUT #ifndef VXLAN_FTABLE_TIMEOUT
#define VXLAN_FTABLE_TIMEOUT (20 * 60) #define VXLAN_FTABLE_TIMEOUT (20 * 60)
▲ Show 20 Lines • Show All 2,273 Lines • ▼ Show 20 Lines#ifdef INET6
return (error); return (error);
#else #else
m_freem(m); m_freem(m);
return (ENOTSUP); return (ENOTSUP);
#endif #endif
} }
#define MTAG_VXLAN_LOOP 0x7876706c /* vxlp */
static int static int
vxlan_transmit(struct ifnet *ifp, struct mbuf *m) vxlan_transmit(struct ifnet *ifp, struct mbuf *m)
{ {
struct rm_priotracker tracker; struct rm_priotracker tracker;
union vxlan_sockaddr vxlsa; union vxlan_sockaddr vxlsa;
struct vxlan_softc *sc; struct vxlan_softc *sc;
struct vxlan_ftable_entry *fe; struct vxlan_ftable_entry *fe;
struct ifnet *mcifp; struct ifnet *mcifp;
struct ether_header *eh; struct ether_header *eh;
int ipv4, error; int ipv4, error;
sc = ifp->if_softc; sc = ifp->if_softc;
eh = mtod(m, struct ether_header *); eh = mtod(m, struct ether_header *);
fe = NULL; fe = NULL;
mcifp = NULL; mcifp = NULL;
ETHER_BPF_MTAP(ifp, m); ETHER_BPF_MTAP(ifp, m);
VXLAN_RLOCK(sc, &tracker); VXLAN_RLOCK(sc, &tracker);
M_SETFIB(m, sc->vxl_fibnum); M_SETFIB(m, sc->vxl_fibnum);
if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
VXLAN_RUNLOCK(sc, &tracker); VXLAN_RUNLOCK(sc, &tracker);
m_freem(m); m_freem(m);
return (ENETDOWN); return (ENETDOWN);
}
if (__predict_false(if_tunnel_check_nesting(ifp, m, MTAG_VXLAN_LOOP,
max_vxlan_nesting) != 0)) {
VXLAN_RUNLOCK(sc, &tracker);
m_freem(m);
if_inc_counter(ifp, IFCOUNTER_OERRORS, 1);
return (ELOOP);
} }
if ((m->m_flags & (M_BCAST | M_MCAST)) == 0) if ((m->m_flags & (M_BCAST | M_MCAST)) == 0)
fe = vxlan_ftable_entry_lookup(sc, eh->ether_dhost); fe = vxlan_ftable_entry_lookup(sc, eh->ether_dhost);
if (fe == NULL) if (fe == NULL)
fe = &sc->vxl_default_fe; fe = &sc->vxl_default_fe;
vxlan_sockaddr_copy(&vxlsa, &fe->vxlfe_raddr.sa); vxlan_sockaddr_copy(&vxlsa, &fe->vxlfe_raddr.sa);
▲ Show 20 Lines • Show All 944 Lines • Show Last 20 Lines