Browse code
Revert "kemix: exported functions to get socket string and name"
This reverts commit 6f6dda289c5c26a3098cae0d8df37e6bc51e1ac1.
Henning Westerholt authored on 21/12/2020 15:29:49
Showing 1 changed files
| ... | ... |
@@ -417,39 +417,6 @@ static sr_kemi_xval_t* ki_kx_get_srcport(sip_msg_t *msg) |
| 417 | 417 |
return &_sr_kemi_kx_xval; |
| 418 | 418 |
} |
| 419 | 419 |
|
| 420 |
-/** |
|
| 421 |
- * |
|
| 422 |
- */ |
|
| 423 |
-static sr_kemi_xval_t* ki_kx_get_send_sock(sip_msg_t *msg) |
|
| 424 |
-{
|
|
| 425 |
- memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); |
|
| 426 |
- if (msg==NULL || msg->force_send_socket==0) {
|
|
| 427 |
- sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); |
|
| 428 |
- return &_sr_kemi_kx_xval; |
|
| 429 |
- } |
|
| 430 |
- |
|
| 431 |
- _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; |
|
| 432 |
- _sr_kemi_kx_xval.v.s = msg->force_send_socket->sock_str; |
|
| 433 |
- return &_sr_kemi_kx_xval; |
|
| 434 |
-} |
|
| 435 |
- |
|
| 436 |
-/** |
|
| 437 |
- * |
|
| 438 |
- */ |
|
| 439 |
-static sr_kemi_xval_t* ki_kx_get_send_sock_name(sip_msg_t *msg) |
|
| 440 |
-{
|
|
| 441 |
- memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); |
|
| 442 |
- if (msg==NULL || msg->force_send_socket==0 |
|
| 443 |
- || msg->force_send_socket->sockname.s==0) {
|
|
| 444 |
- sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); |
|
| 445 |
- return &_sr_kemi_kx_xval; |
|
| 446 |
- } |
|
| 447 |
- |
|
| 448 |
- _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; |
|
| 449 |
- _sr_kemi_kx_xval.v.s = msg->force_send_socket->sockname; |
|
| 450 |
- return &_sr_kemi_kx_xval; |
|
| 451 |
-} |
|
| 452 |
- |
|
| 453 | 420 |
/** |
| 454 | 421 |
* |
| 455 | 422 |
*/ |
| ... | ... |
@@ -484,23 +451,6 @@ static sr_kemi_xval_t* ki_kx_get_rcvport(sip_msg_t *msg) |
| 484 | 451 |
return &_sr_kemi_kx_xval; |
| 485 | 452 |
} |
| 486 | 453 |
|
| 487 |
-/** |
|
| 488 |
- * |
|
| 489 |
- */ |
|
| 490 |
-static sr_kemi_xval_t* ki_kx_get_rcv_sock_name(sip_msg_t *msg) |
|
| 491 |
-{
|
|
| 492 |
- memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); |
|
| 493 |
- if(msg==NULL || msg->rcv.bind_address==NULL |
|
| 494 |
- || msg->rcv.bind_address->sockname.s==NULL) {
|
|
| 495 |
- sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_NONE); |
|
| 496 |
- return &_sr_kemi_kx_xval; |
|
| 497 |
- } |
|
| 498 |
- |
|
| 499 |
- _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; |
|
| 500 |
- _sr_kemi_kx_xval.v.s = msg->rcv.bind_address->sockname; |
|
| 501 |
- return &_sr_kemi_kx_xval; |
|
| 502 |
-} |
|
| 503 |
- |
|
| 504 | 454 |
/** |
| 505 | 455 |
* |
| 506 | 456 |
*/ |
| ... | ... |
@@ -862,26 +812,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = {
|
| 862 | 812 |
{ SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
|
| 863 | 813 |
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } |
| 864 | 814 |
}, |
| 865 |
- { str_init("kx"), str_init("get_send_sock"),
|
|
| 866 |
- SR_KEMIP_XVAL, ki_kx_get_send_sock, |
|
| 867 |
- { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
|
|
| 868 |
- SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } |
|
| 869 |
- }, |
|
| 870 |
- { str_init("kx"), str_init("get_send_sock_name"),
|
|
| 871 |
- SR_KEMIP_XVAL, ki_kx_get_send_sock_name, |
|
| 872 |
- { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
|
|
| 873 |
- SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } |
|
| 874 |
- }, |
|
| 875 | 815 |
{ str_init("kx"), str_init("get_rcvip"),
|
| 876 | 816 |
SR_KEMIP_XVAL, ki_kx_get_rcvip, |
| 877 | 817 |
{ SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
|
| 878 | 818 |
SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } |
| 879 | 819 |
}, |
| 880 |
- { str_init("kx"), str_init("get_rcv_sock_name"),
|
|
| 881 |
- SR_KEMIP_XVAL, ki_kx_get_rcv_sock_name, |
|
| 882 |
- { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
|
|
| 883 |
- SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } |
|
| 884 |
- }, |
|
| 885 | 820 |
{ str_init("kx"), str_init("get_rcvport"),
|
| 886 | 821 |
SR_KEMIP_XVAL, ki_kx_get_rcvport, |
| 887 | 822 |
{ SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,
|