git » pytipc » commit 782d5a5

Remove TIPC_ADDR_MCAST.

author Alberto Bertogli
2007-12-18 02:11:08 UTC
committer Alberto Bertogli
2007-12-18 02:11:08 UTC
parent 15cae2455c1774400949069e98b3abf5ea20e311

Remove TIPC_ADDR_MCAST.

It's the same as TIPC_ADDR_NAMESEQ, there's no need to include it in new
code.

Signed-off-by: Alberto Bertogli <albertito@gmail.com>

tipc.py +3 -3
tipc_ll.c +2 -4

diff --git a/tipc.py b/tipc.py
index f942e3c..425141a 100644
--- a/tipc.py
+++ b/tipc.py
@@ -6,7 +6,7 @@ Alberto Bertogli (albertito@gmail.com)
 
 Addresses are expressed as (addr_type, v1, v2, v3 [, scope]);
 where addr_type can be one of:
-	TIPC_ADDR_NAMESEQ, TIPC_ADDR_MCAST, TIPC_ADDR_NAME, and TIPC_ADDR_ID;
+	TIPC_ADDR_NAMESEQ, TIPC_ADDR_NAME, and TIPC_ADDR_ID;
 and scope can be one of:
 	TIPC_ZONE_SCOPE, TIPC_CLUSTER_SCOPE, and TIPC_NODE_SCOPE.
 
@@ -17,7 +17,7 @@ The meaning of v1, v2 and v3 depend on the value of addr_type:
 		v1 is the server type
 		v2 is the port identifier
 		v3 is ignored
-	if addr_type is TIPC_ADDR_NAMESEQ or TIPC_ADDR_MCAST:
+	if addr_type is TIPC_ADDR_NAMESEQ:
 		v1 is the server type
 		v2 is the lower port number
 		v3 is the upper port number
@@ -35,7 +35,7 @@ import tipc_ll
 
 # Exported constants
 from tipc_ll import AF_TIPC, SOL_TIPC, \
-	TIPC_ADDR_NAMESEQ, TIPC_ADDR_MCAST, TIPC_ADDR_NAME, TIPC_ADDR_ID, \
+	TIPC_ADDR_NAMESEQ, TIPC_ADDR_NAME, TIPC_ADDR_ID, \
 	TIPC_ZONE_SCOPE, TIPC_CLUSTER_SCOPE, TIPC_NODE_SCOPE, \
 	TIPC_IMPORTANCE, \
 	TIPC_SRC_DROPPABLE, TIPC_DEST_DROPPABLE, \
diff --git a/tipc_ll.c b/tipc_ll.c
index 3793bc0..8950daa 100644
--- a/tipc_ll.c
+++ b/tipc_ll.c
@@ -38,7 +38,7 @@ static int fill_sockaddr(struct sockaddr_tipc *sa, PyObject *addr)
 	sa->scope = scope;
 	sa->addrtype = atype;
 
-	if (atype == TIPC_ADDR_NAMESEQ || atype == TIPC_ADDR_MCAST) {
+	if (atype == TIPC_ADDR_NAMESEQ) {
 		sa->addr.nameseq.type = v1;
 		sa->addr.nameseq.lower = v2;
 		sa->addr.nameseq.upper = v3;
@@ -59,8 +59,7 @@ static int fill_sockaddr(struct sockaddr_tipc *sa, PyObject *addr)
 
 static PyObject *sa_to_tuple(const struct sockaddr_tipc *sa)
 {
-	if (sa->addrtype == TIPC_ADDR_NAMESEQ ||
-			sa->addrtype == TIPC_ADDR_MCAST) {
+	if (sa->addrtype == TIPC_ADDR_NAMESEQ) {
 		return Py_BuildValue("IIIII",
 				sa->addrtype,
 				sa->addr.nameseq.type,
@@ -306,7 +305,6 @@ PyMODINIT_FUNC inittipc_ll(void)
 
 	/* for addresses */
 	PyModule_AddIntConstant(m, "TIPC_ADDR_NAMESEQ", TIPC_ADDR_NAMESEQ);
-	PyModule_AddIntConstant(m, "TIPC_ADDR_MCAST", TIPC_ADDR_MCAST);
 	PyModule_AddIntConstant(m, "TIPC_ADDR_NAME", TIPC_ADDR_NAME);
 	PyModule_AddIntConstant(m, "TIPC_ADDR_ID", TIPC_ADDR_ID);