Merged revisions 177849 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r177849 | mvanbaak | 2009-02-21 13:22:32 +0100 (Sat, 21 Feb 2009) | 2 lines

  make chan_sip.c compile on OpenBSD again.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@177851 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2c3c918d321d1567f0b6cd0d8bc1718acd5a40de..1690568f28bd241c7cfc0cd2c6a7c84ac73fd368 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -10366,7 +10366,7 @@ static void destroy_association(struct sip_peer *peer)
        if (!sip_cfg.ignore_regexpire) {
                if (peer->rt_fromcontact) {
                        ast_update_realtime(tablename, "name", peer->name, "fullcontact", "", "ipaddr", "", "port", "", "regseconds", "0", peer->deprecated_username ? "username" : "defaultuser", "", "regserver", "", "useragent", "", SENTINEL);
-                       ast_update_realtime("sippeers", "name", peer->name, "lastms", "", NULL);
+                       ast_update_realtime("sippeers", "name", peer->name, "lastms", "", SENTINEL);
                } else {
                        ast_db_del("SIP/Registry", peer->name);
                }
@@ -16347,7 +16347,7 @@ static void handle_response_peerpoke(struct sip_pvt *p, int resp, struct sip_req
                ast_log(LOG_NOTICE, "Peer '%s' is now %s. (%dms / %dms)\n",
                        peer->name, s, pingtime, peer->maxms);
                ast_devstate_changed(AST_DEVICE_UNKNOWN, "SIP/%s", peer->name);
-               ast_update_realtime("sippeers", "name", peer->name, "lastms", str_lastms, NULL);
+               ast_update_realtime("sippeers", "name", peer->name, "lastms", str_lastms, SENTINEL);
                manager_event(EVENT_FLAG_SYSTEM, "PeerStatus",
                        "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: %s\r\nTime: %d\r\n",
                        peer->name, s, pingtime);
@@ -20695,7 +20695,7 @@ static int sip_poke_noanswer(const void *data)
 
        if (peer->lastms > -1) {
                ast_log(LOG_NOTICE, "Peer '%s' is now UNREACHABLE!  Last qualify: %d\n", peer->name, peer->lastms);
-               ast_update_realtime("sippeers", "name", peer->name, "lastms", "-1", NULL);
+               ast_update_realtime("sippeers", "name", peer->name, "lastms", "-1", SENTINEL);
                manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: SIP\r\nPeer: SIP/%s\r\nPeerStatus: Unreachable\r\nTime: %d\r\n", peer->name, -1);
                if (global_regextenonqualify) {
                        register_peer_exten(peer, FALSE);