1c1 < /* Process model C form file: A1_ip3m_rte_try.pr.c */ --- > /* Process model C form file: A1_ip3m_rte.pr.c */ 8c8 < #include "/u/mask/xinwang/opnet_bak/fixed_ip3/A1_ip3m_rte_try.pr.h" --- > #include "/u/mask/xinwang/opnet_bak/fixed_ip3/A1_ip3m_rte.pr.h" 169c169 < } A1_ip3m_rte_try_state; --- > } A1_ip3m_rte_state; 171c171 < #define pr_state_ptr ((A1_ip3m_rte_try_state*) SimI_Mod_State_Ptr) --- > #define pr_state_ptr ((A1_ip3m_rte_state*) SimI_Mod_State_Ptr) 223c223 < #define FIN_PREAMBLE A1_ip3m_rte_try_state *op_sv_ptr = pr_state_ptr; --- > #define FIN_PREAMBLE A1_ip3m_rte_state *op_sv_ptr = pr_state_ptr; 233c233 < A1_ip3m_rte_try () --- > A1_ip3m_rte () 335c335 < char * proto_str; --- > char * proto_str; 341c341 < FSM_ENTER (A1_ip3m_rte_try) --- > FSM_ENTER (A1_ip3m_rte) 347c347 < FSM_STATE_ENTER_FORCED (0, state0_enter_exec, "arrival", "A1_ip3m_rte_try () [arrival enter execs]") --- > FSM_STATE_ENTER_FORCED (0, state0_enter_exec, "arrival", "A1_ip3m_rte () [arrival enter execs]") 459,460c459,460 < op_ici_attr_get (intf_ici_ptr, "interface_received", &intf_addr); < ip_address_destroy (intf_addr); --- > /*op_ici_attr_get (intf_ici_ptr, "interface_received", &intf_addr); > ip_address_destroy (intf_addr);*/ 478c478 < FSM_STATE_EXIT_FORCED (0, state0_exit_exec, "arrival", "A1_ip3m_rte_try () [arrival exit execs]") --- > FSM_STATE_EXIT_FORCED (0, state0_exit_exec, "arrival", "A1_ip3m_rte () [arrival exit execs]") 500c500 < FSM_STATE_ENTER_UNFORCED (1, state1_enter_exec, "idle", "A1_ip3m_rte_try () [idle enter execs]") --- > FSM_STATE_ENTER_UNFORCED (1, state1_enter_exec, "idle", "A1_ip3m_rte () [idle enter execs]") 507c507 < FSM_EXIT (3,A1_ip3m_rte_try) --- > FSM_EXIT (3,A1_ip3m_rte) 511c511 < FSM_STATE_EXIT_UNFORCED (1, state1_exit_exec, "idle", "A1_ip3m_rte_try () [idle exit execs]") --- > FSM_STATE_EXIT_UNFORCED (1, state1_exit_exec, "idle", "A1_ip3m_rte () [idle exit execs]") 540c540 < FSM_STATE_ENTER_FORCED (2, state2_enter_exec, "svc_start", "A1_ip3m_rte_try () [svc_start enter execs]") --- > FSM_STATE_ENTER_FORCED (2, state2_enter_exec, "svc_start", "A1_ip3m_rte () [svc_start enter execs]") 562c562 < FSM_STATE_EXIT_FORCED (2, state2_exit_exec, "svc_start", "A1_ip3m_rte_try () [svc_start exit execs]") --- > FSM_STATE_EXIT_FORCED (2, state2_exit_exec, "svc_start", "A1_ip3m_rte () [svc_start exit execs]") 575c575 < FSM_STATE_ENTER_FORCED (3, state3_enter_exec, "svc_compl", "A1_ip3m_rte_try () [svc_compl enter execs]") --- > FSM_STATE_ENTER_FORCED (3, state3_enter_exec, "svc_compl", "A1_ip3m_rte () [svc_compl enter execs]") 726,728c726,728 < < /*else if(ip_address_is_multicast (dest_addr) && address_is_mcast_reserved (dest_addr)) < {*/ --- > /* > else if(ip_address_is_multicast (dest_addr) && address_is_mcast_reserved(dest_addr)) > {*/ 732c732 < /*mcast_ici_ptr = op_pk_ici_get (pkptr); --- > /* mcast_ici_ptr = op_pk_ici_get (pkptr); 878,880c878,879 < op_pk_destroy (tmp_data); < /*if (op_pk_nfd_is_set (ip_pkptr, "src_addr")) { < if (op_pk_nfd_get (ip_pkptr, "src_addr", &src_addr) == OPC_COMPCODE_FAILURE) --- > if (op_pk_nfd_is_set (pkptr, "src_addr")) { > if (op_pk_nfd_get (pkptr, "src_addr", &src_addr) == OPC_COMPCODE_FAILURE) 884,885c883,884 < if (op_pk_nfd_is_set (ip_pkptr, "dest_addr")) { < if (op_pk_nfd_get (ip_pkptr, "dest_addr", &tmp_dest_addr) == OPC_COMPCODE_FAILURE) --- > if (op_pk_nfd_is_set (pkptr, "dest_addr")) { > if (op_pk_nfd_get (pkptr, "dest_addr", &tmp_dest_addr) == OPC_COMPCODE_FAILURE) 888,889c887,888 < } */ < op_pk_nfd_get (ip_pkptr, "protocol", &proto_str); --- > } > op_pk_nfd_get (pkptr, "protocol", &proto_str); 890a890 > op_pk_destroy (tmp_data); 893d892 < 902c901 < /*mcast_intf_addr = ip_address_create ("128.2.1.7");*/ --- > mcast_intf_addr = ip_address_create ("128.2.1.7"); 1005c1004 < FSM_STATE_EXIT_FORCED (3, state3_exit_exec, "svc_compl", "A1_ip3m_rte_try () [svc_compl exit execs]") --- > FSM_STATE_EXIT_FORCED (3, state3_exit_exec, "svc_compl", "A1_ip3m_rte () [svc_compl exit execs]") 1026c1025 < FSM_STATE_ENTER_UNFORCED (4, state4_enter_exec, "init", "A1_ip3m_rte_try () [init enter execs]") --- > FSM_STATE_ENTER_UNFORCED (4, state4_enter_exec, "init", "A1_ip3m_rte () [init enter execs]") 1216c1215 < FSM_EXIT (9,A1_ip3m_rte_try) --- > FSM_EXIT (9,A1_ip3m_rte) 1220c1219 < FSM_STATE_EXIT_UNFORCED (4, state4_exit_exec, "init", "A1_ip3m_rte_try () [init exit execs]") --- > FSM_STATE_EXIT_UNFORCED (4, state4_exit_exec, "init", "A1_ip3m_rte () [init exit execs]") 1444c1443 < FSM_STATE_ENTER_UNFORCED (5, state5_enter_exec, "init_too", "A1_ip3m_rte_try () [init_too enter execs]") --- > FSM_STATE_ENTER_UNFORCED (5, state5_enter_exec, "init_too", "A1_ip3m_rte () [init_too enter execs]") 1451c1450 < FSM_EXIT (11,A1_ip3m_rte_try) --- > FSM_EXIT (11,A1_ip3m_rte) 1455c1454 < FSM_STATE_EXIT_UNFORCED (5, state5_exit_exec, "init_too", "A1_ip3m_rte_try () [init_too exit execs]") --- > FSM_STATE_EXIT_UNFORCED (5, state5_exit_exec, "init_too", "A1_ip3m_rte () [init_too exit execs]") 1575c1574 < FSM_STATE_ENTER_UNFORCED (6, state6_enter_exec, "wait", "A1_ip3m_rte_try () [wait enter execs]") --- > FSM_STATE_ENTER_UNFORCED (6, state6_enter_exec, "wait", "A1_ip3m_rte () [wait enter execs]") 1584c1583 < FSM_EXIT (13,A1_ip3m_rte_try) --- > FSM_EXIT (13,A1_ip3m_rte) 1588c1587 < FSM_STATE_EXIT_UNFORCED (6, state6_exit_exec, "wait", "A1_ip3m_rte_try () [wait exit execs]") --- > FSM_STATE_EXIT_UNFORCED (6, state6_exit_exec, "wait", "A1_ip3m_rte () [wait exit execs]") 1619c1618 < FSM_STATE_ENTER_FORCED (7, state7_enter_exec, "mcast_register", "A1_ip3m_rte_try () [mcast_register enter execs]") --- > FSM_STATE_ENTER_FORCED (7, state7_enter_exec, "mcast_register", "A1_ip3m_rte () [mcast_register enter execs]") 1692c1691 < FSM_STATE_EXIT_FORCED (7, state7_exit_exec, "mcast_register", "A1_ip3m_rte_try () [mcast_register exit execs]") --- > FSM_STATE_EXIT_FORCED (7, state7_exit_exec, "mcast_register", "A1_ip3m_rte () [mcast_register exit execs]") 1704c1703 < FSM_STATE_ENTER_FORCED (8, state8_enter_exec, "init_mcast", "A1_ip3m_rte_try () [init_mcast enter execs]") --- > FSM_STATE_ENTER_FORCED (8, state8_enter_exec, "init_mcast", "A1_ip3m_rte () [init_mcast enter execs]") 1771c1770 < FSM_STATE_EXIT_FORCED (8, state8_exit_exec, "init_mcast", "A1_ip3m_rte_try () [init_mcast exit execs]") --- > FSM_STATE_EXIT_FORCED (8, state8_exit_exec, "init_mcast", "A1_ip3m_rte () [init_mcast exit execs]") 1785c1784 < FSM_EXIT (4,A1_ip3m_rte_try) --- > FSM_EXIT (4,A1_ip3m_rte) 1792,1793c1791,1792 < A1_ip3m_rte_try_svar (prs_ptr,var_name,var_p_ptr) < A1_ip3m_rte_try_state *prs_ptr; --- > A1_ip3m_rte_svar (prs_ptr,var_name,var_p_ptr) > A1_ip3m_rte_state *prs_ptr; 1797c1796 < FIN (A1_ip3m_rte_try_svar (prs_ptr)) --- > FIN (A1_ip3m_rte_svar (prs_ptr)) 1898c1897 < A1_ip3m_rte_try_diag () --- > A1_ip3m_rte_diag () 2000c1999 < char * proto_str; --- > char * proto_str; 2005c2004 < FIN (A1_ip3m_rte_try_diag ()) --- > FIN (A1_ip3m_rte_diag ()) 2036c2035 < A1_ip3m_rte_try_terminate () --- > A1_ip3m_rte_terminate () 2138c2137 < char * proto_str; --- > char * proto_str; 2143c2142 < FIN (A1_ip3m_rte_try_terminate ()) --- > FIN (A1_ip3m_rte_terminate ()) 2153,2154c2152,2153 < A1_ip3m_rte_try_init (pr_state_pptr) < A1_ip3m_rte_try_state **pr_state_pptr; --- > A1_ip3m_rte_init (pr_state_pptr) > A1_ip3m_rte_state **pr_state_pptr; 2161c2160 < FIN (A1_ip3m_rte_try_init (pr_state_pptr)) --- > FIN (A1_ip3m_rte_init (pr_state_pptr)) 2165,2166c2164,2165 < if (Vos_Catmem_Register ("proc state vars (A1_ip3m_rte_try)", < sizeof (A1_ip3m_rte_try_state), Vos_Nop, &obtype) == VOSC_FAILURE) --- > if (Vos_Catmem_Register ("proc state vars (A1_ip3m_rte)", > sizeof (A1_ip3m_rte_state), Vos_Nop, &obtype) == VOSC_FAILURE) 2170c2169 < if ((*pr_state_pptr = (A1_ip3m_rte_try_state*) Vos_Catmem_Alloc (obtype, 1)) == OPC_NIL) --- > if ((*pr_state_pptr = (A1_ip3m_rte_state*) Vos_Catmem_Alloc (obtype, 1)) == OPC_NIL) 3058c3057 < if (op_pk_ici_get (ip_pkptr) == OPC_NIL) --- > if ((intf_ici_ptr = op_pk_ici_get (ip_pkptr)) == OPC_NIL) 3070c3069,3073 < --- > else { > op_ici_format (intf_ici_ptr, format_name); > printf ("***%s higher_layer format = %s\n", router_name, format_name); > op_pk_ici_set (ip_pkptr, intf_ici_ptr); > } 3074c3077 < } /* end Xin Wang */ --- > } /* ended Xin Wang */